Update on Settings section of Roundcube H2: images + descriptions

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/01.preferences.en.md

@@ -21,7 +21,7 @@ page-toc:
 
 ![Preferences](en/set_preferences.png)
 
-The user preferences let you adjust various options and settings that control the behavior and the UI of the webmail application. Since there are a lot of them, we will see the main ones. If you want to learn much more, check the [Roundcube documentation](https://docs.roundcube.net/doc/help/1.1/en_US/settings/preferences.html)
+The user preferences let you adjust various options and settings that control the behavior and the UI of the webmail application. *If you want to learn much more, check the [Roundcube documentation](https://docs.roundcube.net/doc/help/1.1/en_US/settings/preferences.html)*
 
 After changing preferences, don’t forget to save them by clicking the **Save** button below the settings form.
 
@@ -36,25 +36,25 @@ This is the **User Interface** section:
 
 #### Main Options are:
 
-- **Language**: The language of the webmail interface is automatically chosen from your computer’s operating system language. However, if you want to change it to a specific language, that is where you should set this.
+- **Language**: The webmail interface language is automatically selected from that of your computer’s operating system. However, if it does not or you want to change it to a specific language, you can do it here.
 
-- **Time zone**:
+- **Time zone**: The client automatically translates dates into your local time zone. By default, it is set to **Auto**, allowing webmail to use the time zone configured on your computer. If you want/need to change it, just select a specific time zone from the list.
 
-- **Time format**:
+- **Time format**: Select how time is displayed.
 
-- **Date format**:
+- **Date format**: Select how dates should be displayed.
 
-- **Pretty dates**: with this option checked, dates close to today will be translated into relative terms like “Today”, “Yesterday”, etc.
+- **Pretty dates**: This option "translates" dates close to today into relative terms like “Today”, “Yesterday”, etc.
 
-- **Display next list entry after delete/move**:
+- **Display next list entry after delete/move**: Enable this option if you want to go directly to the next message after deleting/moving one instead of the message's folder.
 
-- **Refresh (check for new messages, etc.)**:
+- **Refresh (check for new messages, etc.)**: Select how often the client will look for new messages.
 
 #### Interface Skin
-Here is where you can choose how the webclient look like. **Beetroot** is the **Disroot** flavor.
+Here is where you can choose how the webclient look like. **Beetroot** is the default **Disroot Webmail** flavor.
 
 #### Browser Options
-- **Handle popups as standard windows**:
+- **Handle popups as standard windows**: Whether you want to write a message or open it, you can choose to do it on the same window, in a new one or in a new tab. When this option is enabled, the client will behave according to your browser settings.
 
 - **Register protocol handler**: you can register this webmail app to be opened when ever you click an email link somewhere on the web.
 
@@ -77,19 +77,17 @@ To set or change options regarding the mailbox, go to **Settings**, **Preference
 
 - **Rows per page**: The number of messages displayed in the mailbox.
 
-- **Check all folders for new messages**: by default, only the *Inbox* is checked for new messages periodically. If you have server-side filters installed that will move incoming messages to other folders, you should check this option.
-
 #### New Message options
 
-- **Check all folders for new messages**:
+- **Check all folders for new messages**: When enabled, the client will check all folders for new messages. This is useful when you have active filters that forward incoming mail to other folders than the **Inbox**. If it is disable, then by default, only the *Inbox* is checked for new messages periodically.
 
-- **Display browser notifications on new message**:
+- **Display browser notifications on new message**: Enable or disable notifications on your browser when a new message arrives.
 
-- **Display desktop notifications on new message**:
+- **Display desktop notifications on new message**: Enable or disable notifications on your desktop when a new message arrives.
 
-- **Play the sound on new message**:
+- **Play the sound on new message**: Enable or disable a sound notification when a new message arrives.
 
-- **Close desktop notification**:
+- **Close desktop notification**: Choose after how long the desktop notification should be closed.
 
 
 ### 03. Displaying Messages
@@ -105,96 +103,172 @@ To access these options, go to **Settings**, **Preferences** and choose **Displa
 
 ![Displaying Messages](en/displaying.png)
 
-- **Open message in a new window**:
+- **Open message in a new window**: When this option is enabled, double-clicking on an email will open it in a new window.
 
-- **Show email address with display name**:
+- **Show email address with display name**: If enabled, the sender's email address will be displayed next to his/her name when a message is opened.
 
-- **Display HTML**:
+- **Display HTML**: Enable this option to display rich text formatted messages. When disabled, formatted emails will be converted to plain text.
 
-- **Allow remote ressources (images, styles)**: formatted (HTML) messages can contain references to images which have to be loaded from a remote server. This can harm your privacy and reveal to the sender that you opened the message. This technique is often used by spammers to verify that your email address works and you may receive more spam.
+- **Allow remote ressources (images, styles)**: Formatted (HTML) messages can contain references to third-party resources. Allowing this type of content to be loaded by default can represent a serious risk to privacy. Choose how you prefer the client to proceed with them.
 
-- **Display attached images below the message**:
+- **Display attached images below the message**: Check this option if you want images attachments to appear below the message.
 
-- **Display emoticons in plain text messages**:
+- **Display emoticons in plain text messages**: When enabled, the client will "translate" pattern of characters such as **:)** or **:(** into emoticons.
 
 ##### Advanced options
 
-- **Default Character Set**:
+- **Default Character Set**: A character set is a complete set of the characters (numbers, letters, punctuation marks, special symbols) and their number codes that can be recognised by a computing device. Here, you can select the character set/language the majority of your email correspondents use.
 
-- **Show PGP/MIME messages (encrypted)**:
+- **Show PGP/MIME messages (encrypted)**: When encryption is enabled on the server side, checking this option displays the encrypted content of a message in the mailbox view.
 
 
 ### 04. Composing Messages
 
 In **Settings**, **Preferences**, choose **Composing Messages**
 
+![Composing Messages](en/pref_composing.png)
+
+These options and settings determine the look and the experience of composing an email.
+
 ![Composing Messages](en/composing.png)
 
-- **Open message in a new window**:
+- **Compose in a new window**: Enable this option to open the email composer in a new window instead of the current window/tab.
 
-- **Compose HTML messages**: check this option to enable the rich text (HTML) editor when composing a new message. This is only the default setting for HTML message composing. It can be toggled at any time while composing.
+- **Compose HTML messages**: Check this option to enable the rich text (HTML) editor when composing a new message. This is only the default setting for HTML message composing. It can be toggled at any time while composing.
 
-- **Automatically save draft**: while you write a new message, a copy will be saved to the *Drafts* folder ever few minutes.
+- **Automatically save draft**: While you write a new message, a copy will be saved to the *Drafts* folder ever few minutes.
 
-- **When replying**: this option controls whether and where to place the quoted original text when replying to a message.
-Messages forwarding
+- **Always request a return receipt**: Enables the **Return receipt** sending option by default for new messages.
 
-- **Automatically add signature**: select in which cases the signature text from your sender identity is added to a new message.
+- **Always request a delivery status notification**: Activates the **Delivery status notification** sending option by default for new messages.
+
+- **Place replies in the folder of the message being replied to**: Choose the current folder for saving the reply message to instead of saving it to the “Sent” folder.
+
+- **When replying**: This option controls whether and where to place the quoted original text when replying to a message.
+
+- **Messages forwarding**: Controls how messages are forwarded by default when clicking the **Forward** button without choosing a forward mode.
+
+- **Default font of HTML message**: When writing a formatted (HTML) message, this font face and size is used for the default text formatting.
+
+- **Default action of [Reply all] button**: When replying to messages coming from mailing lists, this setting controls how to reply to them.
+
+- **Enable emoticons**: Enables emoticons to be used in the message when it arrives at its destination.
+
+#### Signature options
+- **Automatically add signature**: Select in which cases the signature text from your sender identity is added to a new message.
+
+- **Place signature below the quoted message**: When replying to a chain, this will enable your signature to be placed underneath it.
+
+- **When replying remove original signature from message**: This option removes detected signatures from the original message when citing it in the reply.
+
+- **Force standard separator in signatures**: When checked, two dashes (--) will be added before your signature.
+
+##### Advanced options
+- **Attachment names**: Select the name encoding standard you want/need to use when sending attachments in messages.
+
+- **Save in the browser's local storage (temporarily)**: This option allows or not to save information related to the composing of a message in the browser's local storage.
 
 
 ### 05. Contacts
-In **Settings**, **Preferences**, choose **Contacts**
 
-![Composing Messages](en/contacts.png)
+Go to **Settings**, **Preferences** and choose **Contacts**.
 
-- **Skip alternative email addresses in autocompletion**: with this option checked, every contact will only appear once in the autocompletion list that appears when you start typing in the recipient field. The first email address of the selected contact will then be inserted. If disabled, all email addresses of a matching contact are displayed for selection.
+![Contacts](en/pref_contacts.png)
+
+These options and settings will control how your contacts are handled and displayed.
+
+![Contacts](en/contacts.png)
+
+- **Default address book**: Select here the default address book where new contacts are saved to when adding them from the email view.
+
+- **List contacts as**: You can choose how names are displayed in the contacts list.
+
+- **Sorting columns**: Select the contact attribute used for sorting the contacts in the list.
+
+- **Rows per page**: Enter here the number of contacts that will be displayed in the contacts list.
+
+- **Skip alternative email addresses in autocompletion**: When this option is checked, every contact will only appear once in the autocompletion list that appears when you start typing in the recipient field. The first email address of the selected contact will then be inserted. If disabled, all email addresses of a matching contact are displayed for selection.
 
 
 ### 06. Special Folders
-In **Settings**, **Preferences**, choose **Special Folders**
+Some folders have specific purposes and are used by system processes to store messages. These settings allows you to choose which folders are used to store **Drafts**, **Sent** or deleted messages (**Trash**).
 
-![Composing Messages](en/special_folders.png)
+To access them, go to **Settings**, **Preferences** and choose **Special Folders**.
 
-- **Archive**: set an ARchive folder, so that when hitting the *Archive* button in the mail view, the selected messages are moved to this folder.
+![Special folders](en/pref_sp_folders.png)
 
-- **Divide archive by**: this option allows you to organize your archive folder in various ways. The selected message(s) can be filed into sub-folders of the archive according the sent date, the sender’s email address or the folder the message is moved from.  When set to None, all messages will be stored in the Archive folder without any sub-folders being created.
+##### Main options
+
+![Special folders](en/special_folders.png)
+
+- **Show real names for special folders**: Enabling this setting the original names of the assigned special folders will be displayed in the folders list instead of localized names.
+
+- **Drafts / Sent / Junk / Trash**: Change or set the mail folders.
+
+- **Archive**: If you set an **Archive** folder, when hitting the *Archive* button in the mail view, selected messages are moved to this folder.
+
+##### Archive
+
+- **Divide archive by**: This option allows you to organize your archive folder in various ways. The selected message(s) can be filed into sub-folders of the archive according the sent date, the sender's email address or the folder the message is moved from. When set to None, all messages will be stored in the **Archive** folder without any sub-folders being created.
 
 
 ### 07. Server Settings
-In **Settings**, **Preferences**, choose **Server Settings**
+These options provides more advanced settings that control how messages are treated by the email server.
 
-![Composing Messages](en/server_settings.png)
+To set or modify them, go to **Settings**, **Preferences** and choose **Server Settings**
 
-- **Flag the message for deletion instead of delete**: email messages can be flagged as deleted first before they’re finally removed from a folder. That also allows to “undelete” them later on. In order to finally delete them, use the Compact command from the Mailbox folders operations menu.
+![Server settings](en/pref_server_set.png)
 
-- **Do not show deleted messages**: this option suppresses messages flagged as deleted from being listed.
+##### Main options
+- **Mark the message as read on delete**: When this option is enabled, unread messages will be also flagged as read when deleting them right away.
 
-- **Directly delete messages in Junk**: messages in the *Junk* folder are also move to the *Trash* first when deleting them. Skip that step by enabling this option.
+- **Flag the message for deletion instead of delete**: Email messages can be flagged as deleted first before they’re finally removed from a folder. That also allows to “undelete” them later on. In order to finally delete them, use the Compact command from the Mailbox folders operations menu.
+
+- **Do not show deleted messages**: This option suppresses messages flagged as deleted from being listed.
+
+- **Directly delete messages in Junk**: Messages in the *Junk* folder are also move to the *Trash* first when deleting them. Skip that step by enabling this option.
+
+- **Mark the message as read on archive**: Enable this option to flag as read the unread messages you send to the **Archive** folder.
+
+![Server settings](en/server_settings.png)
+
+##### Maintenance
+- **Clear Trash on logout**: When checked, this will empty the **Trash** folder when you terminate the session.
+
+- **Compact Inbox on logout**: If you enable this option, all messages flagged for deletion from the Inbox will be removed when you log-off.
 
 
 ### 08. Delete Old Messages
-In **Settings**, **Preferences**, choose **Delete Old Messages**
+Go to **Settings**, **Preferences** and choose **Delete Old Messages** to configure how messages are deleted after certain amount of time.
 
-![Composing Messages](en/delete_old.png)
+![Delete Old Messages](en/pref_delete.png)
 
-You can configure those options so that messages older than X months or years can be automatically deleted.
+![Delete Old Messages](en/delete_old.png)
 
-You can set those values per folder if you go the Folders settings.
+You can set those values per folder if you go the **Folders** settings.
 
 
 ### 09. Message Highlights
-In **Settings**, **Preferences**, choose **Message Highlights**
+You can assign specific colors to the messages based on a rule.
 
-You can colorize the message index rows based on specific criteria like sender, recipient and subject.
+To do it, go to **Settings**, **Preferences** and choose **Message Highlights**.
 
-![Composing Messages](en/highlights_view.png)
+![Messages Highlight](en/pref_highlights.png)
 
-In the previous example, here is what is set in **Message Highlights**:
+You will see this screen:
 
-![Composing Messages](en/highlights.png)
+![Messages Highlight](en/highlights_options.png)
 
-*All message From support@disroot.org have a pink color background.*
+You can choose the **Subject**, **From**, **To** and **CC** information to build a rule. To add another rule field, click on **add row**.
 
-You can choose From, To, CC, Subject.
+Let's see an example.
 
-To add other settings, click on **add row**.
+Let's say you want all messages **From** ***support@disroot.org*** have a pink color background.
+
+You will need to combine and build some criteria to apply to the messages. In our case...
+
+![Messages Highlight](en/highlights.png)
+
+... will result in:
+
+![Messages Highlight](en/highlights_view.png)

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/02.folders.en.md

@@ -19,4 +19,4 @@ page-toc:
 
 ## Folders
 
-![Preferences](en/set_preferences.png)
+![Folders](en/set_folders.png)

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/03.identities.en.md

@@ -19,7 +19,7 @@ page-toc:
 
 ## Identities
 
-![Preferences](en/set_preferences.png)
+![Identities](en/set_identities.png)
 
 ### Default identity
 Your identity is how to will be seen as sender when you send out email messages.

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/04.responses.en.md

@@ -18,7 +18,7 @@ page-toc:
 
 ## Responses
 
-![Preferences](en/set_preferences.png)
+![Responses](en/set_preferences.png)
 
 This option allows you to save responses, which can be handy when repeatedly writing emails with the same text.
 

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/05.filters.en.md

@@ -19,7 +19,7 @@ page-toc:
 
 ## Filters
 
-![Preferences](en/set_preferences.png)
+![Filters](en/set_filters.png)
 
 WIth filters, you can specify conditions to match and actions to take on matching, for example move emails from a sender to a specifiy folder. Basically, you tell the mailserver how it should process your mails.
 

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/06.account_details.en.md

@@ -18,4 +18,4 @@ page-toc:
 
 ## Account details
 
-![Preferences](en/set_preferences.png)
+![Account details](en/set_preferences.png)

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/07.2fa.en.md

@@ -19,7 +19,7 @@ page-toc:
 
 ## Two Factor Authentication
 
-![Preferences](en/set_preferences.png)
+![Two Factor Authentication](en/set_preferences.png)
 
 ### Activate Two Factor Authentication
 Two-factor authentication (2FA) adds a second level of authentication to an account log-in. 2FA requires the user to have not only his/her username and password, but also a code provided by an app (for example [Aegis](https://f-droid.org/en/packages/com.beemdevelopment.aegis/), [FreeOTP](https://f-droid.org/en/packages/org.fedorahosted.freeotp/), [andOTP](https://f-droid.org/en/packages/org.shadowice.flocke.andotp/))