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 @@
2020-08-18
-KDE 5.14.2 (20.04.2)
+5.14.2 (Applications 20.04.2)
@@ -52,7 +52,7 @@ start working with it right away. For more in-depth information see the
The first screen of the wizard is Provide personal data. It will prompt you for your basic account information: Full name:, E-mail address, and Password.
By default, the Find provider settings on the Internet 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
Next button when finished.
@@ -65,7 +65,7 @@ start working with it right away. For more in-depth information see the
Account Wizard
- The "Provide personal data" dialogue
+ The "Provide personal data" dialog
@@ -90,7 +90,7 @@ start working with it right away. For more in-depth information see the
Account Wizard 2
- The encryption options dialogue
+ The encryption options dialog
@@ -121,7 +121,7 @@ start working with it right away. For more in-depth information see the
Account Wizard 2
- The account type selection dialogue
+ The account type selection dialog
@@ -148,7 +148,7 @@ start working with it right away. For more in-depth information see the
Account Wizard 2
- The "Personal Settings" dialogue
+ The "Personal Settings" dialog
@@ -189,7 +189,7 @@ start working with it right away. For more in-depth information see the
The SettingsConfigure &kmail;... window consists of six sections:
Accounts, Appearance, Composer,
- Security, Misc, and Plugins.
+ Security, Misc, and Plugins.
To begin sending and receiving messages you will only have to
change some settings on the Accounts 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.
- The new identity dialogue
+ The new identity dialog
- The new identity dialogue
+ The new identity dialog
Adding a new identity
@@ -228,13 +228,13 @@ start working with it right away. For more in-depth information see the
- The new identity dialogue continues
+ The new identity dialog continues
- The new identity dialogue continues
+ The new identity dialog continues
Configuring the new identity
@@ -325,13 +325,13 @@ start working with it right away. For more in-depth information see the
- The sending configuration dialogue
+ The sending configuration dialog
- The sending configuration dialogue
+ The sending configuration dialog
Configuring an &SMTP; account
@@ -376,13 +376,13 @@ start working with it right away. For more in-depth information see the
about file locking.
- The receiving configuration dialogue
+ The receiving configuration dialog
- The receiving configuration dialogue
+ The receiving configuration dialog
Configuring an &IMAP; account
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 @@
2020-09-12
-KDE 5.14.2 (20.04.2)
+5.14.2 (Applications 20.04.2)Using &kmail;
@@ -463,7 +463,9 @@ to preview the message, and MessageP
If you want to send an encrypted
or digitally signed message, select the
-Sign and / or Encrypt icon in the toolbar.
+
+ Sign and / or Encrypt icon in the toolbar.
Use the OptionsCryptographic Message
Format > dropdown list to select the format used to encrypt the
message. (The Optons menu also lets you sign / encrypt the message.)
@@ -526,8 +528,9 @@ allowed.To create &HTML; messages, you must first enable
the markup tools. To do this, enable Rich Text Editing
in the Options menu, or click on
-the Rich Text icon on the &kmail; toolbar. A toolbar with several
-formatting tools will appear. Via the &HTML; toolbar you can choose
+the Rich Text 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 None
drop-down list at the left edge of the toolbar to control the style of bulleted / numbered lists.)
@@ -655,7 +658,7 @@ snippetDelimiter=$
Using the Built-in TranslatorThe &kmail; 2 composer provides a built-in translator that can be accessed by selecting
ToolsTranslator from the
- menubar. A new panel will appear at the bottom of the composer window.
+ menu bar. A new panel will appear at the bottom of the composer window. To translate a section of text, first enter the text you would like translated in the
box labeled Drag text that you want to translate.. Select the language in
which it is written in the From: drop down box. Select the language you
@@ -1263,7 +1266,8 @@ that allow you to fine tune your filtering.Using the first row of check boxes, you can toggle when the
filter is applied: the Apply this filter to incoming messages
option means that the filter is applied to messages when you receive
-them (&ie; on Check Mail).
+them (&ie; on Check Mail).
The filter can be applied to all messages, to all but online IMAP accounts, or
to particular incoming email accounts.The Apply this filter to sent
@@ -1303,7 +1307,9 @@ processing here option.Filters are automatically named unless you explicitly
-rename them using the Rename... button.
+rename them using the
+
+ Rename... button.
The dialog assumes that it should continue auto-naming the filter
as long as the filter name starts with <.
@@ -1749,7 +1755,8 @@ If you want to flag all urgent messages as being
Open up the SettingsConfigure
Filters... dialog and click the
-New icon below the Available Filters
+
+ New icon below the Available Filters
list.
@@ -1815,7 +1822,8 @@ quite perfect, because this fails for cross-posted messages.
Filters....
-Press the New button to create an empty
+Press the button to create an empty
filter. It will appear as <unknown>.
@@ -2267,9 +2275,13 @@ to send you one or more of their public keys.
Sign your MessagesCompose your message as usual in the composer
-window. Before you send the message, check the Sign
+window. Before you send the message, check the
+
+ Sign
icon on the toolbar of the composer window, or select
-Options>Sign Message. Then, you can send
+Options>
+
+ Sign Message. Then, you can send
the message. The identity you are using to write the current message needs to
be connected to an OpenPGP Key in the Identity
section of the Configure dialog.
@@ -2285,13 +2297,19 @@ message will be signed automatically.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 Encrypt
+Before you send the message, check the
+
+ Encrypt
button in the toolbar of the composer window (or select
-Options>Encrypt Message).
+Options>
+
+ Encrypt Message).
Then send the message.
-If you checked the Encrypt button and &kmail;
+If you checked the
+
+ Encrypt 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