[pim/kmail] doc/kmail2: Adding some icons to using-kmail.docbook, plus minor edits
David Bryant
null at kde.org
Tue Nov 3 19:20:54 GMT 2020
Git commit 145382b569ba124f90022cca1279964e2ae1c643 by David Bryant.
Committed on 03/11/2020 at 17:53.
Pushed by davidbryant into branch 'master'.
Adding some icons to using-kmail.docbook, plus minor edits
A +- -- doc/kmail2/document-decrypt.png
A +- -- doc/kmail2/document-edit.png
A +- -- doc/kmail2/document-new.png
M +15 -15 doc/kmail2/getting-started.docbook
M +- -- doc/kmail2/identitiesadvanced.png
D +- -- doc/kmail2/identity.png
M +- -- doc/kmail2/identitycryptography.png
M +- -- doc/kmail2/identitygeneral.png
M +- -- doc/kmail2/identitypicture.png
M +- -- doc/kmail2/identitysignature.png
M +- -- doc/kmail2/identitytemplate.png
A +- -- doc/kmail2/preferences-desktop-font.png
M +32 -14 doc/kmail2/using-kmail.docbook
https://invent.kde.org/pim/kmail/commit/145382b569ba124f90022cca1279964e2ae1c643
diff --git a/doc/kmail2/document-decrypt.png b/doc/kmail2/document-decrypt.png
new file mode 100644
index 000000000..f0be81ed2
Binary files /dev/null and b/doc/kmail2/document-decrypt.png differ
diff --git a/doc/kmail2/document-edit.png b/doc/kmail2/document-edit.png
new file mode 100644
index 000000000..fec08fdb2
Binary files /dev/null and b/doc/kmail2/document-edit.png differ
diff --git a/doc/kmail2/document-new.png b/doc/kmail2/document-new.png
new file mode 100644
index 000000000..1968905e2
Binary files /dev/null and b/doc/kmail2/document-new.png differ
diff --git a/doc/kmail2/getting-started.docbook b/doc/kmail2/getting-started.docbook
index b6d1e882b..5dd2719dd 100644
--- a/doc/kmail2/getting-started.docbook
+++ b/doc/kmail2/getting-started.docbook
@@ -28,7 +28,7 @@
</authorgroup>
<date>2020-08-18</date>
-<releaseinfo>KDE 5.14.2 (20.04.2)</releaseinfo>
+<releaseinfo>5.14.2 (Applications 20.04.2)</releaseinfo>
</chapterinfo>
@@ -52,7 +52,7 @@ start working with it right away. For more in-depth information see the
<step id="Provide-personal-data">
<para>The first screen of the wizard is <guilabel>Provide personal data</guilabel>. It will prompt you for your basic account information: <guilabel>Full name:</guilabel>, <guilabel>E-mail address</guilabel>, and <guilabel>Password</guilabel>.
By default, the <guilabel>Find provider settings on the Internet</guilabel> option is checked, so the wizard will attempt to retrieve the necessary
- information from the email server. Uncheck this option if you are an expert user and you want to set up advanced configuration. Click the
+ information from the email server. Uncheck this option if you are an expert user and you want to set up an advanced configuration. Click the
<guibutton>Next</guibutton> button when finished.</para>
<screenshot>
@@ -65,7 +65,7 @@ start working with it right away. For more in-depth information see the
<phrase>Account Wizard</phrase>
</textobject>
<caption>
- <para>The "Provide personal data" dialogue</para>
+ <para>The "Provide personal data" dialog</para>
</caption>
</mediaobject>
</screenshot>
@@ -90,7 +90,7 @@ start working with it right away. For more in-depth information see the
<phrase>Account Wizard 2</phrase>
</textobject>
<caption>
- <para>The encryption options dialogue</para>
+ <para>The encryption options dialog</para>
</caption>
</mediaobject>
</screenshot>
@@ -121,7 +121,7 @@ start working with it right away. For more in-depth information see the
<phrase>Account Wizard 2</phrase>
</textobject>
<caption>
- <para>The account type selection dialogue</para>
+ <para>The account type selection dialog</para>
</caption>
</mediaobject>
</screenshot>
@@ -148,7 +148,7 @@ start working with it right away. For more in-depth information see the
<phrase>Account Wizard 2</phrase>
</textobject>
<caption>
- <para>The "Personal Settings" dialogue</para>
+ <para>The "Personal Settings" dialog</para>
</caption>
</mediaobject>
</screenshot>
@@ -189,7 +189,7 @@ start working with it right away. For more in-depth information see the
<para>The <menuchoice><guimenu>Settings</guimenu><guisubmenu><inlinemediaobject><imageobject><imagedata fileref="configurebutton.png"
format="PNG"/></imageobject></inlinemediaobject>Configure &kmail;...</guisubmenu></menuchoice> window consists of six sections:
<guilabel>Accounts</guilabel>, <guilabel>Appearance</guilabel>, <guilabel>Composer</guilabel>,
- <guilabel>Security</guilabel>, <guilabel>Misc</guilabel>, and <guilabel>Plugins</guilabel>.</para>
+ <guilabel>Security</guilabel>, <guilabel>Misc</guilabel>, and <guilabel>Plugins</guilabel>. </para>
<para>To begin sending and receiving messages you will only have to
change some settings on the <guilabel>Accounts</guilabel> page.
@@ -208,13 +208,13 @@ start working with it right away. For more in-depth information see the
A small pop-up window will appear.</para>
<screenshot>
- <screeninfo>The new identity dialogue</screeninfo>
+ <screeninfo>The new identity dialog</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="newidentity.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>The new identity dialogue</phrase>
+ <phrase>The new identity dialog</phrase>
</textobject>
<caption>
<para>Adding a new identity</para>
@@ -228,13 +228,13 @@ start working with it right away. For more in-depth information see the
<para> </para> <!-- whitespace -->
<screenshot>
- <screeninfo>The new identity dialogue continues</screeninfo>
+ <screeninfo>The new identity dialog continues</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="newidentity2.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>The new identity dialogue continues</phrase>
+ <phrase>The new identity dialog continues</phrase>
</textobject>
<caption>
<para>Configuring the new identity</para>
@@ -325,13 +325,13 @@ start working with it right away. For more in-depth information see the
<para> </para> <!-- whitespace -->
<screenshot>
- <screeninfo>The sending configuration dialogue</screeninfo>
+ <screeninfo>The sending configuration dialog</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="sending2.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>The sending configuration dialogue</phrase>
+ <phrase>The sending configuration dialog</phrase>
</textobject>
<caption>
<para>Configuring an &SMTP; account</para>
@@ -376,13 +376,13 @@ start working with it right away. For more in-depth information see the
about file locking</link>.</para>
<screenshot>
- <screeninfo>The receiving configuration dialogue</screeninfo>
+ <screeninfo>The receiving configuration dialog</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="receiving.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>The receiving configuration dialogue</phrase>
+ <phrase>The receiving configuration dialog</phrase>
</textobject>
<caption>
<para>Configuring an &IMAP; account</para>
diff --git a/doc/kmail2/identitiesadvanced.png b/doc/kmail2/identitiesadvanced.png
index 8ed16d799..fc228c050 100644
Binary files a/doc/kmail2/identitiesadvanced.png and b/doc/kmail2/identitiesadvanced.png differ
diff --git a/doc/kmail2/identity.png b/doc/kmail2/identity.png
deleted file mode 100644
index 1461068ff..000000000
Binary files a/doc/kmail2/identity.png and /dev/null differ
diff --git a/doc/kmail2/identitycryptography.png b/doc/kmail2/identitycryptography.png
index 19e0aa169..481f8ba3e 100644
Binary files a/doc/kmail2/identitycryptography.png and b/doc/kmail2/identitycryptography.png differ
diff --git a/doc/kmail2/identitygeneral.png b/doc/kmail2/identitygeneral.png
index 1927c37cb..e032b44fc 100644
Binary files a/doc/kmail2/identitygeneral.png and b/doc/kmail2/identitygeneral.png differ
diff --git a/doc/kmail2/identitypicture.png b/doc/kmail2/identitypicture.png
index 1816918e7..4c4333a31 100644
Binary files a/doc/kmail2/identitypicture.png and b/doc/kmail2/identitypicture.png differ
diff --git a/doc/kmail2/identitysignature.png b/doc/kmail2/identitysignature.png
index 3b49a57c2..c5fe83d65 100644
Binary files a/doc/kmail2/identitysignature.png and b/doc/kmail2/identitysignature.png differ
diff --git a/doc/kmail2/identitytemplate.png b/doc/kmail2/identitytemplate.png
index 4830cc083..92fb4a104 100644
Binary files a/doc/kmail2/identitytemplate.png and b/doc/kmail2/identitytemplate.png differ
diff --git a/doc/kmail2/preferences-desktop-font.png b/doc/kmail2/preferences-desktop-font.png
new file mode 100644
index 000000000..48b1089f8
Binary files /dev/null and b/doc/kmail2/preferences-desktop-font.png differ
diff --git a/doc/kmail2/using-kmail.docbook b/doc/kmail2/using-kmail.docbook
index 8897d8981..098d711d0 100644
--- a/doc/kmail2/using-kmail.docbook
+++ b/doc/kmail2/using-kmail.docbook
@@ -18,7 +18,7 @@
</authorgroup>
<date>2020-09-12</date>
-<releaseinfo>KDE 5.14.2 (20.04.2)</releaseinfo>
+<releaseinfo>5.14.2 (Applications 20.04.2)</releaseinfo>
</chapterinfo>
<title>Using &kmail;</title>
@@ -463,7 +463,9 @@ to preview the message, and <menuchoice><guimenu>Message</guimenu><guimenuitem>P
<para>
If you want to send an <link linkend="pgp-encrypt-your-messages">encrypted</link>
or <link linkend="pgp-sign-your-messages">digitally signed</link> message, select the
-<guiicon>Sign</guiicon> and / or <guiicon>Encrypt</guiicon> icon in the toolbar.
+<guiicon><inlinemediaobject><imageobject><imagedata fileref="document-edit.png" format="PNG"/>
+</imageobject></inlinemediaobject> Sign</guiicon> and / or <guiicon><inlinemediaobject><imageobject><imagedata
+fileref="document-decrypt.png" format="PNG"/></imageobject></inlinemediaobject> Encrypt</guiicon> icon in the toolbar.
Use the <menuchoice><guimenuitem>Options</guimenuitem><guisubmenu>Cryptographic Message
Format ></guisubmenu></menuchoice> dropdown list to select the format used to encrypt the
message. (The <guilabel>Optons</guilabel> menu also lets you sign / encrypt the message.)
@@ -526,8 +528,9 @@ allowed.</para>
<para>To create &HTML; messages, you must first enable
the markup tools. To do this, enable <guimenuitem>Rich Text Editing</guimenuitem>
in the <menuchoice><guimenu>Options</guimenu></menuchoice> menu, or click on
-the <guiicon>Rich Text</guiicon> icon on the &kmail; toolbar. A toolbar with several
-formatting tools will appear. Via the &HTML; toolbar you can choose
+the <guiicon><inlinemediaobject><imageobject><imagedata fileref="preferences-desktop-font.png"
+format="PNG"/></imageobject></inlinemediaobject> Rich Text</guiicon> icon on the &kmail; toolbar.
+An additional toolbar with several formatting tools will appear. Via the &HTML; toolbar you can choose
standard text or bulleted / numbered lists. (Use the <guilabel>None <inlinemediaobject><imageobject>
<imagedata fileref="go-down.png" format="PNG"/></imageobject></inlinemediaobject></guilabel>
drop-down list at the left edge of the toolbar to control the style of bulleted / numbered lists.)
@@ -655,7 +658,7 @@ snippetDelimiter=$
<title>Using the Built-in Translator</title>
<para>The &kmail; 2 composer provides a built-in translator that can be accessed by selecting
<menuchoice><guimenu>Tools</guimenu><guimenuitem>Translator</guimenuitem></menuchoice> from the
- menubar. A new panel will appear at the bottom of the composer window.</para>
+ menu bar. A new panel will appear at the bottom of the composer window.</para>
<para> To translate a section of text, first enter the text you would like translated in the
box labeled <guilabel>Drag text that you want to translate.</guilabel>. Select the language in
which it is written in the <guilabel>From:</guilabel> drop down box. Select the language you
@@ -1263,7 +1266,8 @@ that allow you to fine tune your filtering.</para>
<para>Using the first row of check boxes, you can toggle when the
filter is applied: the <guilabel>Apply this filter to incoming messages</guilabel>
option means that the filter is applied to messages when you receive
-them (&ie; on <guiicon>Check Mail</guiicon>).
+them (&ie; on <guiicon><inlinemediaobject><imageobject><imagedata fileref="mail-receive.png"
+format="PNG"/></imageobject></inlinemediaobject> Check Mail</guiicon>).
The filter can be applied to all messages, to all but online IMAP accounts, or
to particular incoming email accounts.</para>
<para>The <guilabel>Apply this filter to sent
@@ -1303,7 +1307,9 @@ processing here</guilabel> option.</para>
</variablelist>
<note><para>Filters are automatically named unless you explicitly
-rename them using the <guibutton>Rename...</guibutton> button.
+rename them using the <guibutton><inlinemediaobject><imageobject>
+<imagedata fileref="document.png" format="PNG"/>
+</imageobject></inlinemediaobject> Rename...</guibutton> button.
The dialog assumes that it should continue auto-naming the filter
as long as the filter name starts with <quote><</quote>.
</para>
@@ -1749,7 +1755,8 @@ If you want to flag all <quote>urgent</quote> messages as being
<step>
<para>Open up the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
Filters...</guimenuitem></menuchoice> dialog and click the
-<guiicon>New</guiicon> icon below the <guilabel>Available Filters</guilabel>
+<guiicon><inlinemediaobject><imageobject><imagedata fileref="document-new.png" format="PNG"/>
+</imageobject></inlinemediaobject> New</guiicon> icon below the <guilabel>Available Filters</guilabel>
list.</para>
</step>
<step>
@@ -1815,7 +1822,8 @@ quite perfect, because this fails for cross-posted messages.</para>
Filters...</guimenuitem></menuchoice>.</para>
</step>
<step>
-<para>Press the <guibutton>New</guibutton> button to create an empty
+<para>Press the <guibutton><inlinemediaobject><imageobject><imagedata fileref="document-new.png"
+format="PNG"/></imageobject></inlinemediaobject></guibutton> button to create an empty
filter. It will appear as <guilabel><unknown></guilabel>.</para>
</step>
<step>
@@ -2267,9 +2275,13 @@ to send you one or more of their public keys.</para>
<title>Sign your Messages</title>
<para>Compose your message as usual in the composer
-window. Before you send the message, check the <guibutton>Sign</guibutton>
+window. Before you send the message, check the <guibutton><inlinemediaobject>
+<imageobject><imagedata fileref="document-edit.png" format="PNG"/>
+</imageobject></inlinemediaobject> Sign</guibutton>
icon on the toolbar of the composer window, or select <menuchoice>
-<guimenu>Options></guimenu><guimenuitem>Sign Message</guimenuitem></menuchoice>. Then, you can send
+<guimenu>Options></guimenu><guimenuitem><inlinemediaobject><imageobject>
+<imagedata fileref="document-edit.png" format="PNG"/></imageobject>
+</inlinemediaobject> Sign Message</guimenuitem></menuchoice>. Then, you can send
the message. The identity you are using to write the current message needs to
be connected to an <guilabel>OpenPGP Key</guilabel> in the <guilabel>Identity</guilabel>
section of the <guilabel>Configure</guilabel> dialog.
@@ -2285,13 +2297,19 @@ message will be signed automatically.</para>
<para>To send an encrypted message to somebody whose
public key is on your gpg key ring, simply create the message in the composer window.
-Before you send the message, check the <guibutton>Encrypt</guibutton>
+Before you send the message, check the <guibutton><inlinemediaobject><imageobject>
+<imagedata fileref="document-decrypt.png" format="PNG"/>
+</imageobject></inlinemediaobject> Encrypt</guibutton>
button in the toolbar of the composer window (or select <menuchoice>
-<guimenu>Options></guimenu><guimenuitem>Encrypt Message</guimenuitem></menuchoice>).
+<guimenu>Options></guimenu><guimenuitem><inlinemediaobject><imageobject>
+<imagedata fileref="document-decrypt.png" format="PNG"/>
+</imageobject></inlinemediaobject> Encrypt Message</guimenuitem></menuchoice>).
Then send the message.</para>
<para>
-If you checked the <guibutton>Encrypt</guibutton> button and &kmail;
+If you checked the <guibutton><inlinemediaobject><imageobject>
+<imagedata fileref="document-decrypt.png" format="PNG"/>
+</imageobject></inlinemediaobject> Encrypt</guibutton> button and &kmail;
cannot find a matching key for a recipient, it will allow you to modify
your key ring before trying again.
If &kmail; finds more than one trusted key for a recipient, it will
More information about the kde-doc-english
mailing list