[evolution/wip/webkit2] Bug 766111 - Use <app> and <gui> tags consistently in manual
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit2] Bug 766111 - Use <app> and <gui> tags consistently in manual
- Date: Tue, 31 May 2016 12:09:07 +0000 (UTC)
commit 6eabe82355fb649711c78a9e15f49e25bcd5968f
Author: Sebastian Rasmussen <sebras gmail com>
Date: Fri May 13 09:41:40 2016 +0200
Bug 766111 - Use <app> and <gui> tags consistently in manual
help/C/contacts-ldap.page | 4 ++--
help/C/data-storage.page | 4 ++--
help/C/default-browser.page | 4 ++--
help/C/deleting-emails.page | 2 +-
help/C/deleting-to-free-disk-space.page | 2 +-
help/C/exchange-placeholder.page | 2 +-
help/C/exporting-data.page | 2 +-
help/C/import-apps-mozilla.page | 10 +++++-----
help/C/import-apps-outlook.page | 10 +++++-----
help/C/import-single-files.page | 2 +-
help/C/import-supported-file-formats.page | 18 +++++++++---------
help/C/index.page | 4 ++--
help/C/intro-application.page | 8 ++++----
help/C/intro-first-run.page | 6 +++---
help/C/intro-main-window.page | 8 ++++----
help/C/mail-access-gmail-imap-account.page | 2 +-
help/C/mail-access-gmail-pop-account.page | 6 +++---
help/C/mail-account-manage-imap-plus.page | 2 +-
help/C/mail-account-manage-local-delivery.page | 2 +-
...-account-manage-maildir-format-directories.page | 4 ++--
.../mail-account-manage-mh-format-directories.page | 2 +-
...-account-manage-microsoft-exchange-evo-ews.page | 2 +-
...account-manage-microsoft-exchange-evo-mapi.page | 2 +-
help/C/mail-account-manage-microsoft-exchange.page | 2 +-
help/C/mail-account-manage-pop.page | 2 +-
...l-account-manage-unix-mbox-spool-directory.page | 2 +-
.../mail-account-manage-unix-mbox-spool-file.page | 2 +-
help/C/mail-account-manage-usenet-news.page | 2 +-
help/C/mail-attachments-received.page | 4 ++--
help/C/mail-attachments-sending.page | 4 ++--
help/C/mail-calendar-sending-invitations.page | 2 +-
help/C/mail-cannot-see.page | 2 +-
help/C/mail-composer-plain-text.page | 2 +-
help/C/mail-composer-priority.page | 2 +-
help/C/mail-composer-search.page | 2 +-
help/C/mail-composer-several-recipients.page | 2 +-
help/C/mail-default-folder-locations.page | 6 +++---
help/C/mail-delete-and-undelete.page | 4 ++--
help/C/mail-displaying-collapsible-headers.page | 2 +-
help/C/mail-displaying-images-in-html.page | 4 ++--
help/C/mail-displaying-sender-photograph.page | 2 +-
help/C/mail-duplicates.page | 2 +-
help/C/mail-encryption-gpg-create-key.page | 2 +-
help/C/mail-encryption-gpg-decrypting.page | 4 ++--
help/C/mail-encryption-gpg-getting-keys.page | 2 +-
help/C/mail-encryption-gpg-set-up.page | 2 +-
help/C/mail-encryption.page | 2 +-
help/C/mail-filters-actions.page | 6 +++---
help/C/mail-filters-conditions.page | 2 +-
help/C/mail-filters-not-working.page | 6 +++---
help/C/mail-filters.page | 2 +-
help/C/mail-folders.page | 4 ++--
help/C/mail-imap-subscriptions.page | 6 +++---
help/C/mail-labels.page | 2 +-
help/C/mail-moving-emails.page | 2 +-
help/C/mail-not-sent.page | 2 +-
help/C/mail-organizing.page | 2 +-
help/C/mail-read-receipts.page | 2 +-
help/C/mail-received-notification.page | 2 +-
help/C/mail-receiving-options-exchange-ews.page | 6 +++---
help/C/mail-receiving-options-exchange-mapi.page | 6 +++---
help/C/mail-receiving-options-imap-plus.page | 12 ++++++------
help/C/mail-receiving-options-local-delivery.page | 2 +-
...ceiving-options-maildir-format-directories.page | 2 +-
...il-receiving-options-mh-format-directories.page | 2 +-
help/C/mail-receiving-options-pop.page | 6 +++---
...ail-receiving-options-unix-mbox-spool-file.page | 2 +-
help/C/mail-receiving-options-usenet-news.page | 6 +++---
help/C/mail-recognized-thread-related-headers.page | 6 +++---
help/C/mail-refresh-folders.page | 2 +-
help/C/mail-search-folders-conditions.page | 4 ++--
help/C/mail-search-folders-refresh.page | 6 +++---
help/C/mail-search-folders.page | 4 ++--
help/C/mail-searching.page | 2 +-
help/C/mail-send-and-receive-automatically.page | 4 ++--
help/C/mail-sending-options-smtp.page | 2 +-
help/C/mail-several-pop-accounts.page | 2 +-
help/C/mail-sorting-message-list.page | 6 +++---
help/C/mail-spam-marking.page | 2 +-
help/C/mail-spam-settings.page | 4 ++--
help/C/mail-two-trash-folders.page | 10 +++++-----
help/C/mail-vertical-view.page | 2 +-
help/C/mail-working-offline.page | 10 +++++-----
help/C/memos-searching.page | 4 ++--
help/C/offline.page | 12 ++++++------
help/C/organizing.page | 2 +-
help/C/problems-debug-how-to.page | 4 ++--
help/C/problems-getting-help.page | 2 +-
help/C/problems-reporting-bugs.page | 4 ++--
help/C/sync-with-other-devices.page | 4 ++--
help/C/tasks-caldav.page | 4 ++--
help/C/tasks-local.page | 4 ++--
help/C/tasks-searching.page | 4 ++--
help/C/tasks-usage-add-task.page | 2 +-
help/C/tasks-webdav.page | 4 ++--
help/C/xinclude-filter-vfolder-conditions.xml | 4 ++--
96 files changed, 186 insertions(+), 186 deletions(-)
---
diff --git a/help/C/contacts-ldap.page b/help/C/contacts-ldap.page
index 54516cf..5da18e5 100644
--- a/help/C/contacts-ldap.page
+++ b/help/C/contacts-ldap.page
@@ -135,8 +135,8 @@
</item>
<item>
<p>You can also mark the network folder for offline usage. To mark the
- folder, right-click the folder, click Properties and select Copy Folder
- Content Locally for Offline Operation.</p>
+ folder, right-click the folder, click <gui>Properties</gui> and select
+ <gui>Copy folder content locally for offline operation</gui>.</p>
</item>
<item>
<p>To prevent excess network traffic, <app>Evolution</app> does not
diff --git a/help/C/data-storage.page b/help/C/data-storage.page
index 5712122..3f5210a 100644
--- a/help/C/data-storage.page
+++ b/help/C/data-storage.page
@@ -2,7 +2,7 @@
type="topic" id="data-storage">
<info>
- <desc>Where does Evolution store my data on the harddisk?</desc>
+ <desc>Where does <app>Evolution</app> store my data on the harddisk?</desc>
<link type="guide" xref="index#common-other-problems" />
@@ -23,7 +23,7 @@
<p>This is only interesting for advanced users who want to debug problems.</p>
</note>
-<p>Evolution 3.6 and later stores its data according to the <link
href="http://www.freedesktop.org/wiki/Specifications/basedir-spec";>XDG Base Directory Specification</link>.
By default this means:</p>
+<p><app>Evolution</app> 3.6 and later stores its data according to the <link
href="http://www.freedesktop.org/wiki/Specifications/basedir-spec";>XDG Base Directory Specification</link>.
By default this means:</p>
<terms>
<item>
diff --git a/help/C/default-browser.page b/help/C/default-browser.page
index 5a17f92..0876955 100644
--- a/help/C/default-browser.page
+++ b/help/C/default-browser.page
@@ -28,7 +28,7 @@
<if:choose>
<if:when test="!platform:gnome-shell !platform:gnome-classic !platform:unity">
-<p>In case you use Evolution under a different environment from GNOME,</p>
+<p>In case you use <app>Evolution</app> under a different environment from GNOME,</p>
<steps>
<item>
<p>Open a terminal application.</p>
@@ -49,7 +49,7 @@
</cmd></p>
</item>
<item>
- <p>Evolution may need to be restarted for the settings to take effect.</p>
+ <p><app>Evolution</app> may need to be restarted for the settings to take effect.</p>
</item>
</steps>
<note style="tip">
diff --git a/help/C/deleting-emails.page b/help/C/deleting-emails.page
index a41e429..df62b2c 100644
--- a/help/C/deleting-emails.page
+++ b/help/C/deleting-emails.page
@@ -27,7 +27,7 @@
<section id="emails">
<title>Mail</title>
-<p>Evolution deletes emails on IMAP servers by <em>marking</em> the messages for deletion; space is not
freed until you <em>expunge</em> the marked emails. </p>
+<p><app>Evolution</app> deletes emails on IMAP servers by <em>marking</em> the messages for deletion; space
is not freed until you <em>expunge</em> the marked emails. </p>
<p>To Expunge a specific folder, go to <guiseq><gui>Folder</gui><gui>Expunge</gui></guiseq> or press
<keyseq><key>Ctrl</key><key>E</key></keyseq>. To Expunge all folders, go to <guiseq><gui>File</gui><gui>Empty
Trash</gui></guiseq>. This applies to other types of accounts as well.</p>
</section>
diff --git a/help/C/deleting-to-free-disk-space.page b/help/C/deleting-to-free-disk-space.page
index d7bf999..2b731a5 100644
--- a/help/C/deleting-to-free-disk-space.page
+++ b/help/C/deleting-to-free-disk-space.page
@@ -2,7 +2,7 @@
type="guide" id="deleting-to-free-disk-space">
<info>
- <desc>Deleting emails and calendar entries to reduce the size of the files used by Evolution.</desc>
+ <desc>Deleting emails and calendar entries to reduce the size of the files used by
<app>Evolution</app>.</desc>
<link type="guide" xref="index#common-other-problems" />
diff --git a/help/C/exchange-placeholder.page b/help/C/exchange-placeholder.page
index 96018fa..8f0308d 100644
--- a/help/C/exchange-placeholder.page
+++ b/help/C/exchange-placeholder.page
@@ -19,5 +19,5 @@
<title>Connecting to Exchange Servers</title>
-<p>For topics not covered here please refer to the <link
href="https://help.gnome.org/users/evolution/2.32/usage-exchange.html";>old Evolution manual</link>.</p>
+<p>For topics not covered here please refer to the <link
href="https://help.gnome.org/users/evolution/2.32/usage-exchange.html";>old <app>Evolution</app>
manual</link>.</p>
</page>
diff --git a/help/C/exporting-data.page b/help/C/exporting-data.page
index 1d26e8d..cbfb8eb 100644
--- a/help/C/exporting-data.page
+++ b/help/C/exporting-data.page
@@ -17,6 +17,6 @@
</info>
-<title>Exporting data from <em>Evolution</em></title>
+<title>Exporting data from <app>Evolution</app></title>
</page>
diff --git a/help/C/import-apps-mozilla.page b/help/C/import-apps-mozilla.page
index ba522a6..d4dd784 100644
--- a/help/C/import-apps-mozilla.page
+++ b/help/C/import-apps-mozilla.page
@@ -2,7 +2,7 @@
type="topic" id="import-apps-mozilla">
<info>
- <desc>Importing data from Mozilla Thunderbird.</desc>
+ <desc>Importing data from Mozilla <app>Thunderbird</app>.</desc>
<link type="guide" xref="import-data#import-from-apps" />
@@ -24,14 +24,14 @@
<steps>
<item><p>Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>.</p></item>
<item><p>In the <gui>Importer Type</gui> tab, click <gui>Import a single file</gui>.</p></item>
-<item><p>Go to the folder in which Thunderbird stores its data. On a Linux system, Thunderbird's files are
located in the hidden folder <file>$HOME/.thunderbird/12345678</file>. <file>12345678</file> will be a random
string. If you cannot see the <file>.thunderbird</file> folder, make sure to <link
xref="help:gnome-help/files-hidden#show-hidden"
href="https://help.gnome.org/users/gnome-help/stable/files-hidden#show-hidden";>show hidden files</link> in
the file selector dialog.</p></item>
+<item><p>Go to the folder in which <app>Thunderbird</app> stores its data. On a Linux system,
<app>Thunderbird</app>'s files are located in the hidden folder <file>$HOME/.thunderbird/12345678</file>.
<file>12345678</file> will be a random string. If you cannot see the <file>.thunderbird</file> folder, make
sure to <link xref="help:gnome-help/files-hidden#show-hidden"
href="https://help.gnome.org/users/gnome-help/stable/files-hidden#show-hidden";>show hidden files</link> in
the file selector dialog.</p></item>
<item>
<list>
-<item><p>If you would like to import Thunderbird mail, go to <file>Mail/Local Folders</file> (for local mail
accounts) or <file>ImapMail/servername</file> (for remote mail accounts). <file>servername</file> will be the
address of your remote mail server. Files without a file ending include your messages (not the
<file>.msf</file> files).</p></item>
-<item><p>If you would like to import Thunderbird/Lightning calendar data, you may be able to export your
Thunderbird events as an <file>.ical</file>/<file>.ics</file> file first, and import these files into
Evolution. This is required as Thunderbird stores its calendar data in a non-standard database
format.</p></item>
+<item><p>If you would like to import <app>Thunderbird</app> mail, go to <file>Mail/Local Folders</file> (for
local mail accounts) or <file>ImapMail/servername</file> (for remote mail accounts). <file>servername</file>
will be the address of your remote mail server. Files without a file ending include your messages (not the
<file>.msf</file> files).</p></item>
+<item><p>If you would like to import <app>Thunderbird/Lightning</app> calendar data, you may be able to
export your <app>Thunderbird</app> events as an <file>.ical</file>/<file>.ics</file> file first, and import
these files into <app>Evolution</app>. This is required as <app>Thunderbird</app> stores its calendar data in
a non-standard database format.</p></item>
</list>
<p>The file type will be automatically determined.</p></item>
-<item><p>Choose the destination (e.g. the folder or calendar in Evolution) for the imported data.</p></item>
+<item><p>Choose the destination (e.g. the folder or calendar in <app>Evolution</app>) for the imported
data.</p></item>
<item><p>Repeat the import steps until you have imported all your data.</p></item>
</steps>
</page>
diff --git a/help/C/import-apps-outlook.page b/help/C/import-apps-outlook.page
index 48fc45c..e6f19c6 100644
--- a/help/C/import-apps-outlook.page
+++ b/help/C/import-apps-outlook.page
@@ -23,7 +23,7 @@
<title>Outlook</title>
<!-- "Import data and settings from older programs" cannot recognize Outlook, as there obviously is no
default storage location for Outlook *under Linux* -->
-<p>These steps refer to locally stored data such as POP accounts. For remote data (like IMAP) this is not
necessary, since the data is still on the server and does not need to be manually transferred. You can set up
the corresponding account in Evolution and the data will be downloaded.</p>
+<p>These steps refer to locally stored data such as POP accounts. For remote data (like IMAP) this is not
necessary, since the data is still on the server and does not need to be manually transferred. You can set up
the corresponding account in <app>Evolution</app> and the data will be downloaded.</p>
<section id="prerequisites">
<title>Prerequisites under Windows</title>
@@ -44,17 +44,17 @@
<p>(Replace "username" by your username.)</p>
</item>
<!-- File locations taken from http://support.microsoft.com/kb/2291280 and
http://answers.microsoft.com/en-us/windows/forum/windows_7-files/where-is-location-of-outlookpst-file-in-windows-7/3a4c03c3-e8ad-4912-9e37-f1c62057d1f9
-->
-<item><p>Copy the Outlook files to the system or partition that Evolution is installed on.</p>
+<item><p>Copy the Outlook files to the system or partition that <app>Evolution</app> is installed on.</p>
<p>As your Windows hard drive is probably in the NTFS format, some Linux systems cannot read it without
additional software. You might find it simpler to copy the mail folders to a USB drive or to burn a
CD.</p></item>
</steps>
</section>
<section id="importing">
-<title>Importing into Evolution</title>
+<title>Importing into <app>Evolution</app></title>
<steps>
<item><p>Depending on your last step, either plug in the disk or USB drive with the data and wait until the
file manager window opens, or mount your Windows drive.</p></item>
<item><p>Copy all the mail files into your home directory or another convenient place.</p></item>
-<item><p>Start Evolution.</p></item>
+<item><p>Start <app>Evolution</app>.</p></item>
<item><p>Optionally select <guiseq><gui>File</gui><gui>New</gui><gui>Mail Folder</gui></guiseq> to create
the <link xref="mail-folders">folders</link> you want.</p></item>
<item><p>Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>.</p></item>
@@ -62,7 +62,7 @@
<item><p>Choose the Outlook personal folders (.pst) file that you would like to import.</p><p>The file type
will be automatically determined.</p>
<note style="tip"><p>If the option to import Outlook personal folders (.pst files) is not available under
<guiseq><gui>File</gui><gui>Import</gui><gui>Import single file</gui><gui>File type</gui></guiseq>, your
distribution might have not enabled this functionality.</p></note>
</item>
-<item><p>Choose the destination (e.g. the folder in Evolution) for the imported data.</p></item>
+<item><p>Choose the destination (e.g. the folder in <app>Evolution</app>) for the imported data.</p></item>
<item><p>Repeat the import steps until you have imported all your data.</p></item>
</steps>
diff --git a/help/C/import-single-files.page b/help/C/import-single-files.page
index a92263f..7354c80 100644
--- a/help/C/import-single-files.page
+++ b/help/C/import-single-files.page
@@ -24,7 +24,7 @@
<item><p>Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>.</p></item>
<item><p>In the <gui>Importer Type</gui> tab, click <gui>Import a single file</gui>.</p></item>
<item><p>Choose the file.</p><p>The file type will be automatically determined.</p></item>
-<item><p>Choose the destination (e.g. the folder in Evolution) for the imported data.</p></item>
+<item><p>Choose the destination (e.g. the folder in <app>Evolution</app>) for the imported data.</p></item>
</steps>
<note style="tip"><p>You can also import contacts that you have received as a vCard attachment of an email
from its attachment menu.</p></note>
diff --git a/help/C/import-supported-file-formats.page b/help/C/import-supported-file-formats.page
index c90a8bf..a4b075d 100644
--- a/help/C/import-supported-file-formats.page
+++ b/help/C/import-supported-file-formats.page
@@ -22,22 +22,22 @@
<title>Supported file formats</title>
-<p>Evolution can import the following types of files:</p>
+<p><app>Evolution</app> can import the following types of files:</p>
<section id="mail">
<title>Mail</title>
<list>
<item><p>
Berkeley Mailbox (.mbox or no extension):</p>
-<p>The email format used by Mozilla, Netscape, Evolution (for local folders until version 2.32), Eudora, and
many other email clients.
+<p>The email format used by <app>Mozilla</app>, <app>Netscape</app>, <app>Evolution</app> (for local folders
until version 2.32), <app>Eudora</app>, and many other email clients.
</p></item>
<item><p>
Maildir (no extension):</p>
-<p>The format used by Evolution (for local folders since version 3.0). There is no need to import Maildir
files as you can <link xref="mail-account-manage-maildir-format-directories">configure a Maildir
account</link> in Evolution and point to the folder where the Maildir files are stored.
+<p>The format used by <app>Evolution</app> (for local folders since version 3.0). There is no need to import
Maildir files as you can <link xref="mail-account-manage-maildir-format-directories">configure a Maildir
account</link> in <app>Evolution</app> and point to the folder where the Maildir files are stored.
</p></item>
<item><p>
Outlook Express 5/6 Personal Folders (.dbx):</p>
-<p>The email file format used by Microsoft Outlook Express 5/6. For newer versions PST import is recommended.
+<p>The email file format used by <app>Microsoft Outlook Express 5/6</app>. For newer versions PST import is
recommended.
</p></item>
</list>
</section>
@@ -47,11 +47,11 @@ Outlook Express 5/6 Personal Folders (.dbx):</p>
<list>
<item><p>
vCalendar (.vcs):</p>
-<p>A format for storing calendar files, which is generally used by Evolution, Microsoft Outlook, Sunbird,
and Korganizer.
+<p>A format for storing calendar files, which is generally used by <app>Evolution</app>, <app>Microsoft
Outlook</app>, <app>Sunbird</app>, and <app>Korganizer</app>.
</p></item>
<item><p>
iCalendar or iCal (.ics):</p>
-<p>A format for storing calendar files. iCalendar is used by Evolution, Microsoft Outlook, Palm OS
handhelds, and others.
+<p>A format for storing calendar files. iCalendar is used by <app>Evolution</app>, <app>Microsoft
Outlook</app>, Palm OS handhelds, and others.
</p></item>
</list>
</section>
@@ -74,12 +74,12 @@ vCard (.vcf, .gcrd):</p>
<title>Miscellaneous</title>
<list>
<item><p>
-Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):</p>
-<p>CSV (Comma-separated values) or Tabulator files saved by using Evolution, Microsoft Outlook and Mozilla.
+<app>Evolution</app>/Mozilla/Outlook CSV/Tab (.csv, .tab):</p>
+<p>CSV (Comma-separated values) or Tabulator files saved by using <app>Evolution</app>, <app>Microsoft
Outlook</app> and <app>Mozilla</app>.
</p></item>
<item><p>
Outlook Personal Folders (.pst):</p>
-<p>A file format used to store local copies of messages, calendar events, and other items within Microsoft
software such as Microsoft Exchange Client, Windows Messaging, and Microsoft Outlook. It is also called
"Personal Storage Table".
+<p>A file format used to store local copies of messages, calendar events, and other items within Microsoft
software such as <app>Microsoft Exchange Client</app>, <app>Windows Messaging</app>, and <app>Microsoft
Outlook</app>. It is also called "Personal Storage Table".
</p></item>
</list>
</section>
diff --git a/help/C/index.page b/help/C/index.page
index 0693ff4..9aa0f30 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -4,7 +4,7 @@
<info>
<desc>Manage your email, contacts and schedule</desc>
<title type='link' role="trail"><media type="image" its:translate="no"
src="figures/evolutionlogo.png"/></title>
- <title type='text'>Evolution Mail and Calendar</title>
+ <title type='text'><app>Evolution</app> Mail and Calendar</title>
<revision pkgversion="3.8.2" version="0.7" date="2013-06-22" status="final"/>
<credit type="author">
<name its:translate="no">Phil Bull</name>
@@ -24,7 +24,7 @@
<media type="image" its:translate="no" src="figures/evolutionlogo.png">
<span its:translate="yes">Evolution logo</span>
</media>
- Evolution Mail and Calendar
+ <app>Evolution</app> Mail and Calendar
</title>
<section id="getting-started" style="2column">
diff --git a/help/C/intro-application.page b/help/C/intro-application.page
index 3c515b1..5610ebd 100644
--- a/help/C/intro-application.page
+++ b/help/C/intro-application.page
@@ -2,7 +2,7 @@
type="topic" id="intro-application">
<info>
- <desc>An introduction to Evolution.</desc>
+ <desc>An introduction to <app>Evolution<app>.</desc>
<link type="guide" xref="index#getting-started"/>
@@ -22,10 +22,10 @@
</info>
<title>Getting Started</title>
-<p>Evolution allows you to access your personal information like your calendars, mail, address books and
tasks in one place.</p>
+<p><app>Evolution</app> allows you to access your personal information like your calendars, mail, address
books and tasks in one place.</p>
-<p>By default Evolution opens the mail view. This is were you can view all your mail. You can change to
other views of the application by going to the bottom of the left pane in the window (the so-called
"switcher") and selecting the desired view. <link xref="intro-main-window">Learn more about the elements of
the main window.</link></p>
+<p>By default <app>Evolution</app> opens the mail view. This is were you can view all your mail. You can
change to other views of the application by going to the bottom of the left pane in the window (the so-called
"switcher") and selecting the desired view. <link xref="intro-main-window">Learn more about the elements of
the main window</link>.</p>
-<note style="advanced"><p>When Evolution starts, it remembers the last view that you used. However you can
also explicitly start Evolution in a specific view. For the calendar view, use the command <cmd>evolution
--component=calendar</cmd> in the <app>Terminal</app> application. Other available options are "mail",
"contacts", "tasks", and "memos".</p></note>
+<note style="advanced"><p>When <app>Evolution</app> starts, it remembers the last view that you used.
However you can also explicitly start <app>Evolution</app> in a specific view. For the calendar view, use the
command <cmd>evolution --component=calendar</cmd> in the <app>Terminal</app> application. Other available
options are "mail", "contacts", "tasks", and "memos".</p></note>
</page>
diff --git a/help/C/intro-first-run.page b/help/C/intro-first-run.page
index 407d40d..30fbf75 100644
--- a/help/C/intro-first-run.page
+++ b/help/C/intro-first-run.page
@@ -5,7 +5,7 @@
type="topic" id="intro-first-run">
<info>
- <desc>Running Evolution for the very first time.</desc>
+ <desc>Running <app>Evolution</app> for the very first time.</desc>
<link type="guide" xref="index#getting-started"/>
@@ -22,7 +22,7 @@
<title>Starting <app>Evolution</app> for the first time</title>
-<p>The first time you run Evolution, it opens the First-Run Assistant to help you set up email accounts and
<link xref="import-data">import data from other applications.</link></p>
+<p>The first time you run <app>Evolution</app>, it opens the First-Run Assistant to help you set up email
accounts and <link xref="import-data">import data from other applications.</link></p>
<include href="xinclude-mail-account-identity.xml"
xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
@@ -228,7 +228,7 @@
<section id="server-type-none">
<title>None</title>
-<p>If you do not plan to use Evolution for receiving email.</p>
+<p>If you do not plan to use <app>Evolution</app> for receiving email.</p>
</section>
</section>
diff --git a/help/C/intro-main-window.page b/help/C/intro-main-window.page
index 6fdfed0..0f4079b 100644
--- a/help/C/intro-main-window.page
+++ b/help/C/intro-main-window.page
@@ -2,7 +2,7 @@
type="topic" id="intro-main-window">
<info>
- <desc>An explanation of the areas shown in the Evolution window.</desc>
+ <desc>An explanation of the areas shown in the <app>Evolution</app> window.</desc>
<link type="guide" xref="index#getting-started"/>
<link type="seealso" xref="calendar-layout"/>
@@ -29,13 +29,13 @@
<title>The <app>Evolution</app> main window</title>
<!-- This section fixes https://bugzilla.gnome.org/show_bug.cgi?id=657028 -->
-<p>Evolution provides functionality for Email, Calendar, Contacts, Tasks, and Memos. You can switch to
another functionality by using the "Switcher" buttons in the lower left corner. Depending on the displayed
functionality also the displayed elements in the window differ.</p>
+<p><app>Evolution</app> provides functionality for Email, Calendar, Contacts, Tasks, and Memos. You can
switch to another functionality by using the "Switcher" buttons in the lower left corner. Depending on the
displayed functionality also the displayed elements in the window differ.</p>
<section id="e-mail">
<title>Mail</title>
<media type="image" src="./figures/window-overview-layers.png" width="600">
- <p>The Evolution mail main window</p>
+ <p>The <app>Evolution</app> mail main window</p>
</media>
<p>Corresponding elements in the mail main window:</p>
@@ -74,7 +74,7 @@
</item>
<item>
<title>Switcher</title>
-<p>The switcher at the bottom of the side bar lets you switch between the Evolution tools: Mail, Contacts,
Calendars, Memos and Tasks.</p><p>For more information see <link xref="change-switcher-appearance">Changing
the Switcher appearance</link>.</p>
+<p>The switcher at the bottom of the side bar lets you switch between the <app>Evolution</app> tools: Mail,
Contacts, Calendars, Memos and Tasks.</p><p>For more information see <link
xref="change-switcher-appearance">Changing the Switcher appearance</link>.</p>
<note style="tip"><p>You can disable the folder list and the switcher side bar by toggling
<guiseq><gui>View</gui><gui>Layout</gui><gui>Show Side Bar</gui></guiseq> or pressing
<key>F9</key>.</p></note>
</item>
<item>
diff --git a/help/C/mail-access-gmail-imap-account.page b/help/C/mail-access-gmail-imap-account.page
index c5ed1b9..e3accd5 100644
--- a/help/C/mail-access-gmail-imap-account.page
+++ b/help/C/mail-access-gmail-imap-account.page
@@ -21,7 +21,7 @@
<!-- Page only exists for the <note>, apart from that nothing special. -->
-<title>Access a Gmail IMAP Account via Evolution</title>
+<title>Access a Gmail IMAP Account via <app>Evolution</app></title>
<p>Please refer to the <link xref="mail-account-manage-imap-plus">IMAP+ mail account settings</link>.</p>
diff --git a/help/C/mail-access-gmail-pop-account.page b/help/C/mail-access-gmail-pop-account.page
index eff9422..f211b6a 100644
--- a/help/C/mail-access-gmail-pop-account.page
+++ b/help/C/mail-access-gmail-pop-account.page
@@ -25,9 +25,9 @@
-<title>Access a Gmail POP Account via Evolution</title>
+<title>Access a Gmail POP Account via <app>Evolution</app></title>
-<p>Follow these steps to set up your Gmail POP Account in Evolution:</p>
+<p>Follow these steps to set up your Gmail POP Account in <app>Evolution</app>:</p>
<steps>
<item><p>Log in to your Gmail account.</p></item>
@@ -40,7 +40,7 @@
</item>
<item><p>Specify the other required settings for this Gmail feature.</p></item>
<item><p>To know the Gmail Account settings, click on <gui>Configuration instructions</gui>. Choose <gui>I
want to enable POP</gui> and select <gui>Other</gui> from the list of clients.</p></item>
-<item><p>On your Evolution client, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail
Accounts</gui></guiseq>. Click <gui style="button">Add</gui>. </p></item>
+<item><p>On your <app>Evolution</app> client, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail
Accounts</gui></guiseq>. Click <gui style="button">Add</gui>. </p></item>
<item><p>Provide the required information. For the account settings, refer to Step 5.</p></item>
</steps>
</page>
diff --git a/help/C/mail-account-manage-imap-plus.page b/help/C/mail-account-manage-imap-plus.page
index 0fed9c7..faf9905 100644
--- a/help/C/mail-account-manage-imap-plus.page
+++ b/help/C/mail-account-manage-imap-plus.page
@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-imap-plus">
<info>
- <desc>Add and edit an IMAP+ mail account in Evolution.</desc>
+ <desc>Add and edit an IMAP+ mail account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-management#mail-common-account-types"/>
diff --git a/help/C/mail-account-manage-local-delivery.page b/help/C/mail-account-manage-local-delivery.page
index e5c1099..7ca8866 100644
--- a/help/C/mail-account-manage-local-delivery.page
+++ b/help/C/mail-account-manage-local-delivery.page
@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-local-delivery">
<info>
- <desc>Add and edit a Local Delivery account in Evolution.</desc>
+ <desc>Add and edit a Local Delivery account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-management#mail-local-account-types"/>
diff --git a/help/C/mail-account-manage-maildir-format-directories.page
b/help/C/mail-account-manage-maildir-format-directories.page
index 71315c5..88e2d0d 100644
--- a/help/C/mail-account-manage-maildir-format-directories.page
+++ b/help/C/mail-account-manage-maildir-format-directories.page
@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-maildir-format-directories">
<info>
- <desc>Add and edit a Maildir Format Mail Directories account in Evolution.</desc>
+ <desc>Add and edit a Maildir Format Mail Directories account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-management#mail-local-account-types"/>
@@ -21,7 +21,7 @@
<section id="account-editor">
<title>Account Editor</title>
-<p>Evolution supports the Maildir++ specification.</p>
+<p><app>Evolution</app> supports the Maildir++ specification.</p>
<p>Mail accounts can be added by choosing <guiseq><gui>File</gui><gui>New</gui><gui>Mail
Account</gui></guiseq> or via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link
xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from
other applications or to restore from a backup file.</p>
<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui></guiseq>.</p>
<p>The following settings are available when editing an existing account:</p>
diff --git a/help/C/mail-account-manage-mh-format-directories.page
b/help/C/mail-account-manage-mh-format-directories.page
index ccfbc17..881fbab 100644
--- a/help/C/mail-account-manage-mh-format-directories.page
+++ b/help/C/mail-account-manage-mh-format-directories.page
@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-mh-format-directories">
<info>
- <desc>Add and edit a MH Format Mail Directories account in Evolution.</desc>
+ <desc>Add and edit a MH Format Mail Directories account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-management#mail-local-account-types"/>
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
index 1c1310f..ed5069a 100644
--- a/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-microsoft-exchange-evo-ews">
<info>
- <desc>Add and edit a Microsoft Exchange 2007 or 2010 account in Evolution.</desc>
+ <desc>Add and edit a Microsoft Exchange 2007 or 2010 account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-manage-microsoft-exchange" group="#first"/>
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
b/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
index 212d3ef..67be2df 100644
--- a/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-microsoft-exchange-evo-mapi">
<info>
- <desc>Add and edit a Microsoft Exchange MAPI account in Evolution.</desc>
+ <desc>Add and edit a Microsoft Exchange MAPI account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-manage-microsoft-exchange"/>
diff --git a/help/C/mail-account-manage-microsoft-exchange.page
b/help/C/mail-account-manage-microsoft-exchange.page
index 04c4705..44024af 100644
--- a/help/C/mail-account-manage-microsoft-exchange.page
+++ b/help/C/mail-account-manage-microsoft-exchange.page
@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-microsoft-exchange">
<info>
- <desc>Add and edit a Microsoft Exchange account in Evolution.</desc>
+ <desc>Add and edit a Microsoft Exchange account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-management#mail-corporate-account-types"/>
<link type="guide" xref="exchange-placeholder"/>
diff --git a/help/C/mail-account-manage-pop.page b/help/C/mail-account-manage-pop.page
index 77fce0e..07d068f 100644
--- a/help/C/mail-account-manage-pop.page
+++ b/help/C/mail-account-manage-pop.page
@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-pop">
<info>
- <desc>Add and edit a POP mail account in Evolution.</desc>
+ <desc>Add and edit a POP mail account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-management#mail-common-account-types"/>
diff --git a/help/C/mail-account-manage-unix-mbox-spool-directory.page
b/help/C/mail-account-manage-unix-mbox-spool-directory.page
index 6959fb5..aee9925 100644
--- a/help/C/mail-account-manage-unix-mbox-spool-directory.page
+++ b/help/C/mail-account-manage-unix-mbox-spool-directory.page
@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-unix-mbox-spool-directory">
<info>
- <desc>Add and edit a Standard Unix mbox Spool Directory account in Evolution.</desc>
+ <desc>Add and edit a Standard Unix mbox Spool Directory account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-management#mail-local-account-types"/>
diff --git a/help/C/mail-account-manage-unix-mbox-spool-file.page
b/help/C/mail-account-manage-unix-mbox-spool-file.page
index 5953ae9..fd033b8 100644
--- a/help/C/mail-account-manage-unix-mbox-spool-file.page
+++ b/help/C/mail-account-manage-unix-mbox-spool-file.page
@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-unix-mbox-spool-file">
<info>
- <desc>Add and edit a Standard Unix mbox Spool File account in Evolution.</desc>
+ <desc>Add and edit a Standard Unix mbox Spool File account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-management#mail-local-account-types"/>
diff --git a/help/C/mail-account-manage-usenet-news.page b/help/C/mail-account-manage-usenet-news.page
index 0855cd4..cd46650 100644
--- a/help/C/mail-account-manage-usenet-news.page
+++ b/help/C/mail-account-manage-usenet-news.page
@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-usenet-news">
<info>
- <desc>Add and edit a Usenet news account in Evolution.</desc>
+ <desc>Add and edit a Usenet news account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-management#mail-common-account-types"/>
diff --git a/help/C/mail-attachments-received.page b/help/C/mail-attachments-received.page
index 444fa18..8ab7ecd 100644
--- a/help/C/mail-attachments-received.page
+++ b/help/C/mail-attachments-received.page
@@ -23,8 +23,8 @@
<title>Handling attachments in received mail</title>
-<p>If you receive an email message with one or more file attachments, Evolution displays the number of
attachments and a <gui style="button">Save</gui> or <gui style="button">Save All</gui> button between the
email header and the content of the email.</p>
-<note style="tip"><p>Evolution does not support saving all attachments of all messages in one folder at
once.</p></note>
+<p>If you receive an email message with one or more file attachments, <app>Evolution</app> displays the
number of attachments and a <gui style="button">Save</gui> or <gui style="button">Save All</gui> button
between the email header and the content of the email.</p>
+<note style="tip"><p><app>Evolution</app> does not support saving all attachments of all messages in one
folder at once.</p></note>
<p>A list of attachments is also available at the bottom of the email.</p>
<p>To save an attachment to disk, click the down-arrow next to the attachment icon and click <gui>Save
As</gui>.</p>
diff --git a/help/C/mail-attachments-sending.page b/help/C/mail-attachments-sending.page
index a366cd8..03daf2b 100644
--- a/help/C/mail-attachments-sending.page
+++ b/help/C/mail-attachments-sending.page
@@ -39,7 +39,7 @@
<section id="reminders">
<title>Attachment Reminder</title>
-<p>Evolution has an Attachment Reminder plugin you can use to remind yourself to attach a file to an email.
If it determines that you have not attached the file, it displays a reminder window before the email is
sent.</p>
+<p><app>Evolution</app> has an Attachment Reminder plugin you can use to remind yourself to attach a file to
an email. If it determines that you have not attached the file, it displays a reminder window before the
email is sent.</p>
<p>To enable the Attachment Reminder:</p>
<steps>
@@ -48,7 +48,7 @@
<item><p>Click the <gui>Configuration</gui> tab.</p></item>
<item><p>Click <gui style="button">Add</gui>, then enter keywords in your language such as "Attach" or
"enclosed".</p></item>
</steps>
-<p>Based on the keywords you have added, Evolution searches the text of every mail you are going to send. If
it finds any of the keywords in your email and there is no actual attached file, the reminder window is
displayed.</p>
+<p>Based on the keywords you have added, <app>Evolution</app> searches the text of every mail you are going
to send. If it finds any of the keywords in your email and there is no actual attached file, the reminder
window is displayed.</p>
</section>
diff --git a/help/C/mail-calendar-sending-invitations.page b/help/C/mail-calendar-sending-invitations.page
index 0aa94ec..4f170f6 100644
--- a/help/C/mail-calendar-sending-invitations.page
+++ b/help/C/mail-calendar-sending-invitations.page
@@ -20,7 +20,7 @@
<title>Sending invitations by email</title>
-<p>If you create an event in the calendar component, you can then send invitations to the attendee list
through the Evolution email tool. The invitation card is sent as an attachment in iCal format.</p>
+<p>If you create an event in the calendar component, you can then send invitations to the attendee list
through the <app>Evolution</app> email tool. The invitation card is sent as an attachment in iCal format.</p>
<p>To send an invitation, right-click on the entry in the calendar and choose <gui>Forward as
iCalendar</gui>.</p>
diff --git a/help/C/mail-cannot-see.page b/help/C/mail-cannot-see.page
index 21e6084..8c6cd20 100644
--- a/help/C/mail-cannot-see.page
+++ b/help/C/mail-cannot-see.page
@@ -30,7 +30,7 @@
<p>If you cannot see any emails at all in a folder, check that you have not maximized the message preview
(so the message list pane is hidden). To do this, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Show
Message Preview</gui></guiseq>.</p>
</item>
<item>
- <p>Look in the <gui>Junk</gui> folder. Messages that are marked as Junk disappear from the original folder
and are moved to the Junk folder.
+ <p>Look in the <gui>Junk</gui> folder. Messages that are marked as Junk disappear from the original folder
and are moved to the <gui>Junk</gui> folder.
</p>
</item>
<!-- Does the following option still exist? -->
diff --git a/help/C/mail-composer-plain-text.page b/help/C/mail-composer-plain-text.page
index d594695..ea634aa 100644
--- a/help/C/mail-composer-plain-text.page
+++ b/help/C/mail-composer-plain-text.page
@@ -26,7 +26,7 @@
<section id="headers-and-lists">
<title>Headers and Lists:</title>
<p>At the left of the upper tool bar, you can choose <gui>Normal</gui> for a default text style or
<gui>Header 1</gui> through <gui>Header 6</gui> for varying sizes of header from large (1) to tiny (6). Other
styles include <gui>Preformat</gui>, to use the HTML tag for preformatted blocks of text, and three types of
bullet points for lists.</p>
- <p>For instance, instead of using asterisks to mark a bulleted list, you can use the <gui>Bulleted
List</gui> style from the style dropdown list. Evolution uses different bullet styles, and handles word wrap
and multiple levels of indentation.</p>
+ <p>For instance, instead of using asterisks to mark a bulleted list, you can use the <gui>Bulleted
List</gui> style from the style dropdown list. <app>Evolution</app> uses different bullet styles, and handles
word wrap and multiple levels of indentation.</p>
</section>
<section id="alignment">
diff --git a/help/C/mail-composer-priority.page b/help/C/mail-composer-priority.page
index c50b35b..63bc4c0 100644
--- a/help/C/mail-composer-priority.page
+++ b/help/C/mail-composer-priority.page
@@ -24,6 +24,6 @@
<p>You can prioritize a message to be sent, so that the recipient sees its relative importance. To
prioritize a message, select <guiseq><gui>Options</gui><gui>Prioritize Message</gui></guiseq> in the menu of
the composer window or click the corresponding toolbar icon.</p>
-<note style="tip"><p>Evolution will ignore the message priority of incoming messages because the recipient
should decide whether the message is important or not. You can set the "Important" flag for any
messages.</p></note>
+<note style="tip"><p><app>Evolution</app> will ignore the message priority of incoming messages because the
recipient should decide whether the message is important or not. You can set the "Important" flag for any
messages.</p></note>
<!-- TODO: Nowhere is explained how to set the Important flag. -->
</page>
diff --git a/help/C/mail-composer-search.page b/help/C/mail-composer-search.page
index c194c64..42a5ccf 100644
--- a/help/C/mail-composer-search.page
+++ b/help/C/mail-composer-search.page
@@ -25,7 +25,7 @@
<list>
<item><p><gui>Find</gui>:
</p><p>
-Enter a word or phrase, and Evolution finds it in your message.</p></item>
+Enter a word or phrase, and <app>Evolution</app> finds it in your message.</p></item>
<item><p><gui>Find Again</gui>:
</p><p>
diff --git a/help/C/mail-composer-several-recipients.page b/help/C/mail-composer-several-recipients.page
index f1cd26b..b72ba11 100644
--- a/help/C/mail-composer-several-recipients.page
+++ b/help/C/mail-composer-several-recipients.page
@@ -38,7 +38,7 @@
<section id="autocompletion">
<title>Autocompletion</title>
-<p>It is recommended to use the <link xref="contacts-autocompletion">Autocompletion</link> feature of the
Evolution address book for entering addresses. By using this you avoid typos and save time.</p>
+<p>It is recommended to use the <link xref="contacts-autocompletion">Autocompletion</link> feature of the
<app>Evolution</app> address book for entering addresses. By using this you avoid typos and save time.</p>
</section>
<section id="to-cc-bcc-buttons">
diff --git a/help/C/mail-default-folder-locations.page b/help/C/mail-default-folder-locations.page
index 02ee0dd..f28384b 100644
--- a/help/C/mail-default-folder-locations.page
+++ b/help/C/mail-default-folder-locations.page
@@ -2,7 +2,7 @@
type="topic" id="mail-default-folder-locations">
<info>
- <desc>Changing the location of Draft, Sent, Trash and Junk folders.</desc>
+ <desc>Changing the location of <gui>Draft</gui>, <gui>Sent</gui>, <gui>Trash</gui> and <gui>Junk</gui>
folders.</desc>
<link type="guide" xref="mail-account-manage-imap-plus#defaults"/>
<link type="guide" xref="mail-account-manage-local-delivery#defaults"/>
@@ -28,8 +28,8 @@
<title>Mail folder locations</title>
-<p>You can set a different place where to store messages in your Draft folder and Sent folder in the
<gui>Defaults</gui> section of the mail account editor
(<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Defaults</gui></guiseq>).</p>
+<p>You can set a different place where to store messages in your <gui>Draft</gui> folder and <gui>Sent</gui>
folder in the <gui>Defaults</gui> section of the mail account editor
(<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Defaults</gui></guiseq>).</p>
<p>You can define an <gui>Archive Folder</gui>, for example to move older messages there. Selecting
<guiseq><gui>Message</gui><gui>Archive</gui></guiseq> in the main window moves the selected message to the
specified folder.</p>
-<p>For remote account types (accounts such as IMAP) you can also use folders on the mail server for Junk and
Trash by selecting the corresponding <gui>Use a Real Folder</gui> option. In this case, Evolution's local
<link xref="mail-search-folders">virtual folders</link> will not be used.</p>
+<p>For remote account types (accounts such as IMAP) you can also use folders on the mail server for Junk and
Trash by selecting the corresponding <gui>Use a Real Folder</gui> option. In this case,
<app>Evolution</app>'s local <link xref="mail-search-folders">virtual folders</link> will not be used.</p>
</page>
diff --git a/help/C/mail-delete-and-undelete.page b/help/C/mail-delete-and-undelete.page
index 177d3c8..c248ce9 100644
--- a/help/C/mail-delete-and-undelete.page
+++ b/help/C/mail-delete-and-undelete.page
@@ -29,7 +29,7 @@
<p>To delete a message, select it and press the <key>Delete</key> key, or click the <gui
style="button">Delete</gui> button in the toolbar, or press <keyseq><key>Ctrl</key><key>D</key></keyseq>, or
right-click the message and click <gui>Delete</gui>.</p>
-<p>When you press Delete or click the Trash folder, your mail is not actually deleted, but is marked for
deletion. You can see all message marked for deletion in the Trash folder. To show deleted messages, click
<guiseq><gui>View</gui><gui>Show Deleted Messages</gui></guiseq>. You can view the messages stricken off for
later deletion.</p>
+<p>When you press Delete or click the <gui>Trash</gui> folder, your mail is not actually deleted, but is
marked for deletion. You can see all message marked for deletion in the <gui>Trash</gui> folder. To show
deleted messages, click <guiseq><gui>View</gui><gui>Show Deleted Messages</gui></guiseq>. You can view the
messages stricken off for later deletion.</p>
<p>To permanently erase all the deleted messages in a folder, click
<guiseq><gui>Folder</gui><gui>Expunge</gui></guiseq> or press
<keyseq><key>Ctrl</key><key>E</key></keyseq>.</p>
</section>
@@ -39,7 +39,7 @@
<p>You can undelete a message that has been deleted but not expunged yet. To undelete a message, select the
message, click <guiseq><gui>Edit</gui><gui>Undelete message</gui></guiseq>. Note that
<guiseq><gui>View</gui><gui>Show Deleted Messages</gui></guiseq> must be enabled for this to work.</p>
-<p>If you have marked a message for deletion, undeleting it unmarks it, and the message is not shown anymore
in the Trash folder.</p>
+<p>If you have marked a message for deletion, undeleting it unmarks it, and the message is not shown anymore
in the <gui>Trash</gui> folder.</p>
</section>
</page>
diff --git a/help/C/mail-displaying-collapsible-headers.page b/help/C/mail-displaying-collapsible-headers.page
index 31821d4..1023c9e 100644
--- a/help/C/mail-displaying-collapsible-headers.page
+++ b/help/C/mail-displaying-collapsible-headers.page
@@ -22,7 +22,7 @@
<title>Collapsible Message Headers</title>
-<p>Evolution compresses the To, Cc and Bcc headers of received mail and shows only five addresses in the
message preview.</p>
+<p><app>Evolution</app> compresses the To, Cc and Bcc headers of received mail and shows only five addresses
in the message preview.</p>
<p>To see all recipients, click the <media type="image" its:translate="no"
src="./figures/plus-icon.png"></media> icon next to the <gui>To:</gui> or <gui>Cc:</gui> line, or click the
ellipsis (…) at the end of the five displayed addresses.</p>
diff --git a/help/C/mail-displaying-images-in-html.page b/help/C/mail-displaying-images-in-html.page
index 6f671b8..ad2180c 100644
--- a/help/C/mail-displaying-images-in-html.page
+++ b/help/C/mail-displaying-images-in-html.page
@@ -26,11 +26,11 @@
<title>Images in HTML messages</title>
-<p>When someone sends you HTML mail that includes an image in the body of the message (for example, the
welcome message in your Inbox), Evolution displays the image inside the message.</p>
+<p>When someone sends you HTML mail that includes an image in the body of the message (for example, the
welcome message in your Inbox), <app>Evolution</app> displays the image inside the message.</p>
<section id="loading">
<title>Loading images</title>
-<p>Some images are links in a message, rather than being part of the message. Evolution can download those
images from the Internet, but does not do so unless you request it. This is because remotely hosted images
can be slow to load and display, and can even be used by spammers to track who reads the email. Not
automatically loading images helps protect your privacy.</p>
+<p>Some images are links in a message, rather than being part of the message. <app>Evolution</app> can
download those images from the Internet, but does not do so unless you request it. This is because remotely
hosted images can be slow to load and display, and can even be used by spammers to track who reads the email.
Not automatically loading images helps protect your privacy.</p>
<p>To load the images for one message, click <guiseq><gui>View</gui><gui>Load Images</gui></guiseq> or press
<keyseq><key>Ctrl</key><key>I</key></keyseq>.</p>
diff --git a/help/C/mail-displaying-sender-photograph.page b/help/C/mail-displaying-sender-photograph.page
index 8ae150b..f89dc6a 100644
--- a/help/C/mail-displaying-sender-photograph.page
+++ b/help/C/mail-displaying-sender-photograph.page
@@ -23,7 +23,7 @@
<title>Photograph Message Headers</title>
<!-- NB: This is done by "Face" and "X-Face" headers. -->
-<p>Evolution automatically displays photographs of the sender of an email at the right side of the message
header if the sender already embedded a photograph in the message.</p>
+<p><app>Evolution</app> automatically displays photographs of the sender of an email at the right side of
the message header if the sender already embedded a photograph in the message.</p>
<!-- TODO: If I ever manage to find out if the "Edit > Plugins > Face" reliably works, create a topic page
covering it linked under <link type="guide" xref="index#mail-composing-advanced" />, and link to it from here
and vice versa. -->
<p>You can also manually enable displaying the photograph of the sender of an email if the sender is in one
of your address books and has a photograph stored.</p>
diff --git a/help/C/mail-duplicates.page b/help/C/mail-duplicates.page
index 23d8d38..c807785 100644
--- a/help/C/mail-duplicates.page
+++ b/help/C/mail-duplicates.page
@@ -34,7 +34,7 @@
<p>Downloading duplicate emails may be due to one of the following reasons:</p>
<list>
<item><p>There are several copies of the same message in the mailbox</p></item>
-<item><p>Evolution is having a problem with the UIDL extension.</p></item>
+<item><p><app>Evolution</app> is having a problem with the UIDL extension.</p></item>
<item><p>The cache files located at <file>$HOME/.local/share/evolution/mail/local/</file> are not
writable.</p></item>
</list>
</section>
diff --git a/help/C/mail-encryption-gpg-create-key.page b/help/C/mail-encryption-gpg-create-key.page
index e622cdb..8713f2e 100644
--- a/help/C/mail-encryption-gpg-create-key.page
+++ b/help/C/mail-encryption-gpg-create-key.page
@@ -21,6 +21,6 @@
<!-- TODO:POST-3-13: Needs a complete rewrite now that https://bugzilla.gnome.org/show_bug.cgi?id=508744 is
fixed. -->
-<p>Before you can get or send GPG encrypted mail, you need to <link xref="help:seahorse/pgp-create"
href="https://help.gnome.org/users/seahorse/stable/pgp-create";>generate your public and private keys with
GPG</link>. After doing so and <link xref="mail-encryption-gpg-set-up">setting up Evolution to use the
key</link>, you need to <link xref="help:seahorse/pgp-publish"
href="https://help.gnome.org/users/seahorse/stable/pgp-publish";>share your public key with your friends to
allow them sending you encrypted messages</link>.</p>
+<p>Before you can get or send GPG encrypted mail, you need to <link xref="help:seahorse/pgp-create"
href="https://help.gnome.org/users/seahorse/stable/pgp-create";>generate your public and private keys with
GPG</link>. After doing so and <link xref="mail-encryption-gpg-set-up">setting up <app>Evolution</app> to use
the key</link>, you need to <link xref="help:seahorse/pgp-publish"
href="https://help.gnome.org/users/seahorse/stable/pgp-publish";>share your public key with your friends to
allow them sending you encrypted messages</link>.</p>
</page>
diff --git a/help/C/mail-encryption-gpg-decrypting.page b/help/C/mail-encryption-gpg-decrypting.page
index 6fa6694..9044f6d 100644
--- a/help/C/mail-encryption-gpg-decrypting.page
+++ b/help/C/mail-encryption-gpg-decrypting.page
@@ -25,12 +25,12 @@
<section id="decryption">
<title>Decrypting a received message</title>
<p>If you receive an encrypted message, you need to decrypt it before you can read it.</p>
-<p>When you view the message, Evolution prompts you for your PGP password. Enter it, and the unencrypted
message is displayed.</p>
+<p>When you view the message, <app>Evolution</app> prompts you for your PGP password. Enter it, and the
unencrypted message is displayed.</p>
<note style="tip"><p>Senders must have your GPG public key before they can send you an encrypted
message.</p></note>
</section>
<section id="signature">
<title>Checking the signature of a received message</title>
-<p>To check the sender's signature of a received message, scroll down to the bottom of the message and click
the logo. Evolution will display <gui>Security Information</gui> for the message.</p>
+<p>To check the sender's signature of a received message, scroll down to the bottom of the message and click
the logo. <app>Evolution</app> will display <gui>Security Information</gui> for the message.</p>
</section>
</page>
diff --git a/help/C/mail-encryption-gpg-getting-keys.page b/help/C/mail-encryption-gpg-getting-keys.page
index a94eeaf..95d08a1 100644
--- a/help/C/mail-encryption-gpg-getting-keys.page
+++ b/help/C/mail-encryption-gpg-getting-keys.page
@@ -22,5 +22,5 @@
<title>Getting and using GPG public keys</title>
-<p>To send an encrypted message, you need to use the recipient's public key in combination with your private
key. Evolution handles the encryption, but you need to <link xref="help:seahorse/pgp-import"
href="https://help.gnome.org/users/seahorse/stable/pgp-import";>get the public key and add it to your
keyring</link>.</p>
+<p>To send an encrypted message, you need to use the recipient's public key in combination with your private
key. <app>Evolution</app> handles the encryption, but you need to <link xref="help:seahorse/pgp-import"
href="https://help.gnome.org/users/seahorse/stable/pgp-import";>get the public key and add it to your
keyring</link>.</p>
</page>
diff --git a/help/C/mail-encryption-gpg-set-up.page b/help/C/mail-encryption-gpg-set-up.page
index 350ab2f..005ac6f 100644
--- a/help/C/mail-encryption-gpg-set-up.page
+++ b/help/C/mail-encryption-gpg-set-up.page
@@ -35,6 +35,6 @@
<item><p>Click <gui style="button">OK</gui>.</p></item>
<item><p>Click <gui style="button">Close</gui>.</p></item>
</steps>
-<p>Evolution requires that you know your key ID. If you do not remember it, start <app>Passwords and
Keys</app>, go to <gui>GnuPG Keys</gui>, select the preferred GPG key, right-click on it, select
<gui>Properties</gui> and copy the <gui>Key ID</gui>. Your key ID is an eight-character string with random
numbers and letters.</p>
+<p><app>Evolution</app> requires that you know your key ID. If you do not remember it, start <app>Passwords
and Keys</app>, go to <gui>GnuPG Keys</gui>, select the preferred GPG key, right-click on it, select
<gui>Properties</gui> and copy the <gui>Key ID</gui>. Your key ID is an eight-character string with random
numbers and letters.</p>
</page>
diff --git a/help/C/mail-encryption.page b/help/C/mail-encryption.page
index 48040cb..a6522e2 100644
--- a/help/C/mail-encryption.page
+++ b/help/C/mail-encryption.page
@@ -29,7 +29,7 @@
<title>Mail encryption and certificates</title>
-<p>Evolution offers GPG Encryption and S/MIME Encryption for signing and encrypting email messages. S/MIME
is used most often in corporate environments.</p>
+<p><app>Evolution</app> offers GPG Encryption and S/MIME Encryption for signing and encrypting email
messages. S/MIME is used most often in corporate environments.</p>
<section id="gpg" style="2column">
<title>GPG</title>
diff --git a/help/C/mail-filters-actions.page b/help/C/mail-filters-actions.page
index 41085ac..db35d76 100644
--- a/help/C/mail-filters-actions.page
+++ b/help/C/mail-filters-actions.page
@@ -57,13 +57,13 @@
<p>Makes the system beep.</p></item>
<item><p>Play Sound:</p>
-<p>Select a sound file for Evolution to play.</p></item>
+<p>Select a sound file for <app>Evolution</app> to play.</p></item>
<item><p>Run Program:</p>
-<p>Evolution runs an application.</p></item>
+<p><app>Evolution</app> runs an application.</p></item>
<item><p>Pipe to Program:</p>
-<p>Sends the message to an application of your choice. No return value is expected. This feature can be used
to create automatic Web postings from email messages or to perform additional message post processing not
supported by Evolution.</p></item>
+<p>Sends the message to an application of your choice. No return value is expected. This feature can be used
to create automatic Web postings from email messages or to perform additional message post processing not
supported by <app>Evolution</app>.</p></item>
<item><p>Forward to:</p>
<p>Forwards the message to another email address.</p></item>
diff --git a/help/C/mail-filters-conditions.page b/help/C/mail-filters-conditions.page
index 587052b..7e67273 100644
--- a/help/C/mail-filters-conditions.page
+++ b/help/C/mail-filters-conditions.page
@@ -34,7 +34,7 @@ included by XInclude. See http://blogs.gnome.org/shaunm/2011/07/21/understanding
<p>Filters messages according the server you got them from. This is most useful if you use multiple POP mail
accounts.</p></item>
<item><p>Pipe to Program:</p>
-<p>Evolution can use an external command to process a message, then process it based on the return value.
Commands used in this way must return an integer. This is most commonly used to add an external junk mail
filter.</p></item>
+<p><app>Evolution</app> can use an external command to process a message, then process it based on the
return value. Commands used in this way must return an integer. This is most commonly used to add an external
junk mail filter.</p></item>
<item><p>Junk Test:</p>
<p>Filters based on the results of the <link xref="mail-spam">junk mail</link> test.</p></item>
diff --git a/help/C/mail-filters-not-working.page b/help/C/mail-filters-not-working.page
index 1728ecd..c234d3c 100644
--- a/help/C/mail-filters-not-working.page
+++ b/help/C/mail-filters-not-working.page
@@ -34,18 +34,18 @@
<section id="several-clients">
<title>Using Several Mail Clients</title>
-<p>Another thing you have to keep in mind is that filters depend on the "new" flag that is set on the server
when a particular email message is initially fetched from the server. If you use another email client aside
from Evolution, your filters may not work automatically.</p>
+<p>Another thing you have to keep in mind is that filters depend on the "new" flag that is set on the server
when a particular email message is initially fetched from the server. If you use another email client aside
from <app>Evolution</app>, your filters may not work automatically.</p>
</section>
<section id="filter-log">
<title>Logging Filter Actions</title>
<p>If it is still unclear why filters do not work as expected, you can enable logging filter actions.</p>
<list>
-<item><p>Close Evolution.</p></item>
+<item><p>Close <app>Evolution</app>.</p></item>
<item><p>Open the <app>Terminal</app> application.</p></item>
<item><p>Run the command <cmd>gsettings set org.gnome.evolution.mail filters-log-actions
true</cmd></p></item>
<item><p>Run the command <cmd>gsettings set org.gnome.evolution.mail filters-log-file
"/home/myusername/my-filter-log"</cmd> and replace <cmd>myusername</cmd> by your username. This will create a
text file named <file>my-filter-log</file> in your home directory. Note that the absolute path to the file
name must be entered; a syntax like <sys>~</sys> or <sys>$HOME</sys> will not work.</p></item><!-- this is
explained in https://bugzilla.gnome.org/show_bug.cgi?id=669471 -->
-<item><p>Start Evolution.</p></item>
+<item><p>Start <app>Evolution</app>.</p></item>
<item><p>Fetch mail to apply filters.</p></item>
<item><p>Open the file <file>my-filter-log</file> with a text editor to see which filter actions have been
applied.</p></item>
</list>
diff --git a/help/C/mail-filters.page b/help/C/mail-filters.page
index 6568884..1713e19 100644
--- a/help/C/mail-filters.page
+++ b/help/C/mail-filters.page
@@ -24,7 +24,7 @@
<p>Message filters apply actions on messages based on conditions that you have defined. You can define
filters for both incoming and outgoing emails.</p>
-<p>Filters will be automatically applied to incoming messages for local accounts (such as POP). Mail servers
for remote accounts (such as IMAP) often already filter mail directly on the server as this is faster. If you
want to apply your Evolution filters to remote accounts, you can enable this under
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui><gui>Options</gui><gui>Apply filters to new messages in
Inbox on this server</gui></guiseq>.</p>
+<p>Filters will be automatically applied to incoming messages for local accounts (such as POP). Mail servers
for remote accounts (such as IMAP) often already filter mail directly on the server as this is faster. If you
want to apply your <app>Evolution</app> filters to remote accounts, you can enable this under
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui><gui>Options</gui><gui>Apply filters to new messages in
Inbox on this server</gui></guiseq>.</p>
<p>To manually apply filters on messages in a folder, select the messages and click
<guiseq><gui>Message</gui><gui>Apply Filters</gui></guiseq> or press
<keyseq><key>Ctrl</key><key>Y</key></keyseq>.</p>
<p>You can select all messages in a folder by clicking <guiseq><gui>Edit</gui><gui>Select All</gui></guiseq>
or pressing <keyseq><key>Ctrl</key><key>A</key></keyseq>.</p>
diff --git a/help/C/mail-folders.page b/help/C/mail-folders.page
index 4bd3ad5..5295d48 100644
--- a/help/C/mail-folders.page
+++ b/help/C/mail-folders.page
@@ -27,7 +27,7 @@
<title>Using Folders</title>
-<p>Evolution, like most mail systems, uses folders to store email messages. You start out with a few mail
folders such as the Inbox, Outbox, and Drafts. You can, however, create more folders if required.</p>
+<p><app>Evolution</app>, like most mail systems, uses folders to store email messages. You start out with a
few mail folders such as the Inbox, Outbox, and Drafts. You can, however, create more folders if required.</p>
<section id="create-folder">
<title>Creating A Folder</title>
@@ -40,7 +40,7 @@
<p>The new folder will be shown in the folder view. You can then move messages into the folder.</p>
<note style="warning">
-<p>The Inbox folders on most IMAP servers cannot contain both messages and subfolders. When creating
additional folders on your IMAP mail server, branch the folders from the root of the IMAP account and not
from the Inbox. Creating subfolders in your Inbox may prevent you from reading messages that exist in the
Inbox. If this happens, move the folders to the IMAP account.</p>
+<p>The <gui>Inbox</gui> folders on most IMAP servers cannot contain both messages and subfolders. When
creating additional folders on your IMAP mail server, branch the folders from the root of the IMAP account
and not from the Inbox. Creating subfolders in your Inbox may prevent you from reading messages that exist in
the Inbox. If this happens, move the folders to the IMAP account.</p>
</note>
</section>
diff --git a/help/C/mail-imap-subscriptions.page b/help/C/mail-imap-subscriptions.page
index 6fe3100..f3bdf0c 100644
--- a/help/C/mail-imap-subscriptions.page
+++ b/help/C/mail-imap-subscriptions.page
@@ -24,13 +24,13 @@
<title>IMAP Subscriptions</title>
-<p>As opening many IMAP folders on the server takes time you can define which IMAP folders to check and
display in Evolution, and which ones to ignore for the time being, via the <gui>IMAP Subscriptions
Manager</gui>.</p>
+<p>As opening many IMAP folders on the server takes time you can define which IMAP folders to check and
display in <app>Evolution</app>, and which ones to ignore for the time being, via the <gui>IMAP Subscriptions
Manager</gui>.</p>
<steps>
<item><p>Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>, or right-click on the top level
node of an email account in the folder list and click <gui>Manage subscriptions</gui>.</p></item>
<item><p>If you have accounts on multiple servers, select the server where you want to manage your
subscriptions.</p></item>
-<item><p>Evolution displays a list of files and folders available on the IMAP server.</p></item>
+<item><p><app>Evolution</app> displays a list of files and folders available on the IMAP server.</p></item>
<item><p>Select a file or folder by clicking it.</p>
-<p>You should select at least the Inbox folder. Depending upon the way your IMAP server is configured, the
list of available files might include non-mail folders. If it does, you can ignore them.</p></item>
+<p>You should select at least the <gui>Inbox</gui> folder. Depending upon the way your IMAP server is
configured, the list of available files might include non-mail folders. If it does, you can ignore
them.</p></item>
<item><p>Click a folder's checkbox to add a folder to your subscriptions.</p></item>
</steps>
diff --git a/help/C/mail-labels.page b/help/C/mail-labels.page
index bf2a14d..af86971 100644
--- a/help/C/mail-labels.page
+++ b/help/C/mail-labels.page
@@ -20,7 +20,7 @@
<title>Using Labels</title>
-<p>You can add colored labels to emails in order to categorize them. This is similar to <link
xref="using-categories">Categories</link> in the other Evolution windows.</p>
+<p>You can add colored labels to emails in order to categorize them. This is similar to <link
xref="using-categories">Categories</link> in the other <app>Evolution</app> windows.</p>
<p>You can search for messages with specific labels by using the <link xref="mail-searching">quick search
dropdown</link>. Also, <link xref="mail-search-folders">search folders</link> can be created based on
labels.</p>
diff --git a/help/C/mail-moving-emails.page b/help/C/mail-moving-emails.page
index 75b6cf4..710673b 100644
--- a/help/C/mail-moving-emails.page
+++ b/help/C/mail-moving-emails.page
@@ -23,7 +23,7 @@
<title>Moved emails are still shown in the original folder</title>
-<p>If your IMAP mail server does not yet support <link href="http://tools.ietf.org/html/rfc6851";>IMAP's
"move" feature</link> which was introduced in January 2013, Evolution "moves" messages by copying and
deleting emails. Deleting means "marking messages for deletion" so all the original messages are retained
until you expunge the emails marked for deletion.</p>
+<p>If your IMAP mail server does not yet support <link href="http://tools.ietf.org/html/rfc6851";>IMAP's
"move" feature</link> which was introduced in January 2013, <app>Evolution</app> "moves" messages by copying
and deleting emails. Deleting means "marking messages for deletion" so all the original messages are retained
until you expunge the emails marked for deletion.</p>
<p>See the topic on <link xref="mail-delete-and-undelete">deleting emails</link> for instructions on how to
expunge email messages. Note that this applies to other types of accounts as well.</p>
diff --git a/help/C/mail-not-sent.page b/help/C/mail-not-sent.page
index 9130726..d4f0158 100644
--- a/help/C/mail-not-sent.page
+++ b/help/C/mail-not-sent.page
@@ -24,7 +24,7 @@
<list>
<item><p>Invalid email address. Check if all the addresses listed as mail recipients are correct. If the
message contains a wrong or invalid email address, the message will not be sent.</p></item>
<item><p>Incorrect SMTP settings. Verify if the settings used for outgoing messages are correct. Using the
incorrect server address or authentication method may prevent emails from being sent.</p></item>
-<item><p>Offline status. Evolution may be offline. Check on the <gui style="button">Send and Receive</gui>
button; if it is greyed out, then you are offline. To go online, go to <guiseq><gui>File</gui><gui>Work
online</gui></guiseq>. You should now be able to use the <gui style="button">Send and Receive</gui>
button.</p></item>
+<item><p>Offline status. <app>Evolution</app> may be offline. Check on the <gui style="button">Send and
Receive</gui> button; if it is greyed out, then you are offline. To go online, go to
<guiseq><gui>File</gui><gui>Work online</gui></guiseq>. You should now be able to use the <gui
style="button">Send and Receive</gui> button.</p></item>
</list>
</page>
diff --git a/help/C/mail-organizing.page b/help/C/mail-organizing.page
index 33af3a5..97e38b9 100644
--- a/help/C/mail-organizing.page
+++ b/help/C/mail-organizing.page
@@ -20,7 +20,7 @@
<title>Sorting and organizing mail</title>
-<p>Evolution provides several options to organize your mail according to your needs.</p>
+<p><app>Evolution</app> provides several options to organize your mail according to your needs.</p>
<section id="advanced" style="2column">
<title>Advanced Options</title>
diff --git a/help/C/mail-read-receipts.page b/help/C/mail-read-receipts.page
index ab711a8..96a367c 100644
--- a/help/C/mail-read-receipts.page
+++ b/help/C/mail-read-receipts.page
@@ -35,6 +35,6 @@
<p>You can request read receipts by selecting <guiseq><gui>Options</gui><gui>Request Read
Receipt</gui></guiseq> in the menu of the composer window or clicking the corresponding toolbar icon.</p>
-<p>For read receipts that you receive you can define Evolution's behavior under <gui>Message Receipts</gui>
under the account's <link xref="mail-default-folder-locations"><gui>Defaults</gui></link>.</p>
+<p>For read receipts that you receive you can define <app>Evolution</app>'s behavior under <gui>Message
Receipts</gui> under the account's <link xref="mail-default-folder-locations"><gui>Defaults</gui></link>.</p>
</page>
diff --git a/help/C/mail-received-notification.page b/help/C/mail-received-notification.page
index fc3861d..36f9ac8 100644
--- a/help/C/mail-received-notification.page
+++ b/help/C/mail-received-notification.page
@@ -20,7 +20,7 @@
<title>Getting notified of new mail</title>
-<p>Evolution always notifies you of new messages by adding a yellow star to the mailer icon in the window
<link xref="change-switcher-appearance">switcher</link>.</p>
+<p><app>Evolution</app> always notifies you of new messages by adding a yellow star to the mailer icon in
the window <link xref="change-switcher-appearance">switcher</link>.</p>
<!-- Translators: Please make sure that the screenshot does have the small yellow star in the Mail icon -->
<media type="image" src="./figures/new-mail-switcher.png" width="256">
<p>Switcher layout when a new message has arrived</p>
diff --git a/help/C/mail-receiving-options-exchange-ews.page b/help/C/mail-receiving-options-exchange-ews.page
index 4007f75..0c0b79b 100644
--- a/help/C/mail-receiving-options-exchange-ews.page
+++ b/help/C/mail-receiving-options-exchange-ews.page
@@ -28,7 +28,7 @@
<item><p>Enter your username for that server.</p></item>
<item><p>Either manually enter the Host URL and OAB URL, or click <gui style="button">Fetch URL</gui> which
will ask you for your password and then try to automatically fill in the values.</p>
<note style="tip"><p>If you are in an organizational environment, you may want to contact your system
administrator for more information.</p></note></item>
-<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for
Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not
announce the authentication mechanisms they support, so clicking this button is not a guarantee that
available mechanisms actually work.</p></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for
Supported Types</gui> to have <app>Evolution</app> check for supported authentication mechanisms. Some
servers do not announce the authentication mechanisms they support, so clicking this button is not a
guarantee that available mechanisms actually work.</p></item>
</list>
</section>
@@ -39,8 +39,8 @@
<p>On the <gui>Receiving Options</gui> page (accessible via
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
<list>
-<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new
messages every … minutes</gui> option and select the frequency in minutes.</p></item>
-<item><p>You can also define if Evolution checks for new messages in all folders.</p></item>
+<item><p>If you want <app>Evolution</app> to check automatically for new messages, click the <gui>Check for
new messages every … minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>You can also define if <app>Evolution</app> checks for new messages in all folders.</p></item>
<item><p>If you would like to have a copy of the address book on the server for offline access to it, enable
<gui>Cache offline address book</gui> and click <gui style="button">Fetch list</gui>. Afterwards, select the
address book from the available options.</p></item>
<item><p>Select if you want <link xref="mail-filters">filters</link> to be automatically applied on mail
that you receive, if <link xref="mail-spam-marking">spam</link> should be automatically filtered, and if
<link xref="mail-working-offline">mail on the server should be synchronized with your local copy for offline
access to it</link>.</p></item>
</list>
diff --git a/help/C/mail-receiving-options-exchange-mapi.page
b/help/C/mail-receiving-options-exchange-mapi.page
index f2a14a2..ad5ac9d 100644
--- a/help/C/mail-receiving-options-exchange-mapi.page
+++ b/help/C/mail-receiving-options-exchange-mapi.page
@@ -28,7 +28,7 @@
<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for
that server.</p></item>
<item><p>Enter the Domain name for that server.</p>
<note style="tip"><p>If you are in an organizational environment, you may want to contact your system
administrator for more information.</p></note></item>
-<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for
Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not
announce the authentication mechanisms they support, so clicking this button is not a guarantee that
available mechanisms actually work.</p></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for
Supported Types</gui> to have <app>Evolution</app> check for supported authentication mechanisms. Some
servers do not announce the authentication mechanisms they support, so clicking this button is not a
guarantee that available mechanisms actually work.</p></item>
<item><p>Select if you want to use a secure connection (SSL or TLS).</p></item>
<item><p>Click <gui style="button">Authenticate</gui> and enter your password.</p></item>
</list>
@@ -41,8 +41,8 @@
<p>On the <gui>Receiving Options</gui> page (accessible via
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
<list>
-<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new
messages every … minutes</gui> option and select the frequency in minutes.</p></item>
-<item><p>You can also define if Evolution checks for new messages in all folders.</p></item>
+<item><p>If you want <app>Evolution</app> to check automatically for new messages, click the <gui>Check for
new messages every … minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>You can also define if <app>Evolution</app> checks for new messages in all folders.</p></item>
</list>
</section>
diff --git a/help/C/mail-receiving-options-imap-plus.page b/help/C/mail-receiving-options-imap-plus.page
index f33b60e..825e327 100644
--- a/help/C/mail-receiving-options-imap-plus.page
+++ b/help/C/mail-receiving-options-imap-plus.page
@@ -31,8 +31,8 @@
<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for
that server.</p></item>
<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if
your server supports it.</p>
<note style="tip"><p>Free webmail providers often supply information about which of these options can be
used. If you are in an organizational environment, you may want to contact your system administrator for more
information.</p></note></item>
-<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for
Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not
announce the authentication mechanisms they support, so clicking this button is not a guarantee that
available mechanisms actually work.</p></item>
-<item><p>Select if you want Evolution to remember your password.</p></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for
Supported Types</gui> to have <app>Evolution</app> check for supported authentication mechanisms. Some
servers do not announce the authentication mechanisms they support, so clicking this button is not a
guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want <app>Evolution</app> to remember your password.</p></item>
</list>
</section>
@@ -43,12 +43,12 @@
<p>On the <gui>Receiving Options</gui> page (accessible via
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
<list>
-<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new
messages every … minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>If you want <app>Evolution</app> to check automatically for new messages, click the <gui>Check for
new messages every … minutes</gui> option and select the frequency in minutes.</p></item>
<item><p>Select <gui>Use Quick Resync</gui> if the IMAP server supports <link
href="http://tools.ietf.org/html/rfc5162";>IMAP4 Extensions for Quick Mailbox
Resynchronization</link>.</p></item>
<!-- https://bugzilla.gnome.org/show_bug.cgi?id=730460 -->
-<item><p>If the mail server does not allow multiple connections from Evolution to the server at the same
time (for example when you have more than one account on that server), set <gui>Number of concurrent
connections to use</gui> to 1.</p></item>
-<item><p>You can also define if Evolution checks for new messages in all folders, or only in subscribed
folders.</p></item>
-<item><p>Select if you want Evolution to show only <link xref="mail-imap-subscriptions">subscribed
folders</link>.</p></item>
+<item><p>If the mail server does not allow multiple connections from <app>Evolution</app> to the server at
the same time (for example when you have more than one account on that server), set <gui>Number of concurrent
connections to use</gui> to 1.</p></item>
+<item><p>You can also define if <app>Evolution</app> checks for new messages in all folders, or only in
subscribed folders.</p></item>
+<item><p>Select if you want <app>Evolution</app> to show only <link
xref="mail-imap-subscriptions">subscribed folders</link>.</p></item>
<item><p>Select if you want <link xref="mail-filters">filters</link> to be automatically applied on mail
that you receive, if <link xref="mail-spam-marking">spam</link> should be automatically filtered, and if
<link xref="mail-working-offline">mail on the server should be synchronized with your local copy for offline
access to it</link>.</p></item></list>
</section>
diff --git a/help/C/mail-receiving-options-local-delivery.page
b/help/C/mail-receiving-options-local-delivery.page
index 045340a..cf22edc 100644
--- a/help/C/mail-receiving-options-local-delivery.page
+++ b/help/C/mail-receiving-options-local-delivery.page
@@ -36,7 +36,7 @@
<p>On the <gui>Receiving Options</gui> page (accessible via
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
<list>
-<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new
messages every … minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>If you want <app>Evolution</app> to check automatically for new messages, click the <gui>Check for
new messages every … minutes</gui> option and select the frequency in minutes.</p></item>
</list>
</section>
diff --git a/help/C/mail-receiving-options-maildir-format-directories.page
b/help/C/mail-receiving-options-maildir-format-directories.page
index c3b521a..b8f1986 100644
--- a/help/C/mail-receiving-options-maildir-format-directories.page
+++ b/help/C/mail-receiving-options-maildir-format-directories.page
@@ -36,7 +36,7 @@
<p>On the <gui>Receiving Options</gui> page (accessible via
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
<list>
-<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new
messages every … minutes</gui> option and select the frequency in minutes.</p>
+<item><p>If you want <app>Evolution</app> to check automatically for new messages, click the <gui>Check for
new messages every … minutes</gui> option and select the frequency in minutes.</p>
<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your
inbox, enable <gui>Apply filters to new messages in Inbox</gui>.</p></item>
</list>
diff --git a/help/C/mail-receiving-options-mh-format-directories.page
b/help/C/mail-receiving-options-mh-format-directories.page
index 0580faa..8b6ad81 100644
--- a/help/C/mail-receiving-options-mh-format-directories.page
+++ b/help/C/mail-receiving-options-mh-format-directories.page
@@ -36,7 +36,7 @@
<p>On the <gui>Receiving Options</gui> page (accessible via
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
<list>
-<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new
messages every … minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>If you want <app>Evolution</app> to check automatically for new messages, click the <gui>Check for
new messages every … minutes</gui> option and select the frequency in minutes.</p></item>
</list>
</section>
diff --git a/help/C/mail-receiving-options-pop.page b/help/C/mail-receiving-options-pop.page
index 9aa26b0..9cfb1c5 100644
--- a/help/C/mail-receiving-options-pop.page
+++ b/help/C/mail-receiving-options-pop.page
@@ -35,8 +35,8 @@
<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for
that server.</p></item>
<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if
your server supports it.</p>
<note style="tip"><p>Free webmail providers often supply information about which of these options can be
used. If you are in an organizational environment, you may want to contact your system administrator for more
information.</p></note></item>
-<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for
Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not
announce the authentication mechanisms they support, so clicking this button is not a guarantee that
available mechanisms actually work.</p></item>
-<item><p>Select if you want Evolution to remember your password.</p></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for
Supported Types</gui> to have <app>Evolution</app> check for supported authentication mechanisms. Some
servers do not announce the authentication mechanisms they support, so clicking this button is not a
guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want <app>Evolution</app> to remember your password.</p></item>
</list>
</section>
@@ -47,7 +47,7 @@
<p>On the <gui>Receiving Options</gui> page (accessible via
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
<list>
-<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new
messages every … minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>If you want <app>Evolution</app> to check automatically for new messages, click the <gui>Check for
new messages every … minutes</gui> option and select the frequency in minutes.</p></item>
<item><p>If you want the messages to remain on the server for a period of time, click the <gui>Leave
messages on server</gui> option and the <gui>Delete after ... days</gui> option and select the number of days
to allow messages to remain on the server.</p></item>
<item><p>The option <gui>Disable support for all POP3 extensions</gui> is only useful when accessing old or
misconfigured mail servers. <link href="https://tools.ietf.org/html/rfc2449";>POP3 extensions</link> provide
enhanced functionality, however only some servers support them. In case of problems with receiving mail,
enabling this setting might help.</p></item>
</list>
diff --git a/help/C/mail-receiving-options-unix-mbox-spool-file.page
b/help/C/mail-receiving-options-unix-mbox-spool-file.page
index b91728c..6e013f1 100644
--- a/help/C/mail-receiving-options-unix-mbox-spool-file.page
+++ b/help/C/mail-receiving-options-unix-mbox-spool-file.page
@@ -36,7 +36,7 @@
<p>On the <gui>Receiving Options</gui> page (accessible via
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
<list>
-<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new
messages every … minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>If you want <app>Evolution</app> to check automatically for new messages, click the <gui>Check for
new messages every … minutes</gui> option and select the frequency in minutes.</p></item>
<item><p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in
your inbox, enable <gui>Apply filters to new messages in Inbox</gui>.</p></item>
</list>
diff --git a/help/C/mail-receiving-options-usenet-news.page b/help/C/mail-receiving-options-usenet-news.page
index 199e4a7..369e19c 100644
--- a/help/C/mail-receiving-options-usenet-news.page
+++ b/help/C/mail-receiving-options-usenet-news.page
@@ -31,8 +31,8 @@
<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for
that server.</p></item>
<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if
your server supports it.</p>
<note style="tip"><p>Free webmail providers often supply information about which of these options can be
used. If you are in an organizational environment, you may want to contact your system administrator for more
information.</p></note></item>
-<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for
Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not
announce the authentication mechanisms they support, so clicking this button is not a guarantee that
available mechanisms actually work.</p></item>
-<item><p>Select if you want Evolution to remember your password.</p></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for
Supported Types</gui> to have <app>Evolution</app> check for supported authentication mechanisms. Some
servers do not announce the authentication mechanisms they support, so clicking this button is not a
guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want <app>Evolution</app> to remember your password.</p></item>
</list>
</section>
@@ -43,7 +43,7 @@
<p>On the <gui>Receiving Options</gui> page (accessible via
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
<list>
-<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new
messages every … minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>If you want <app>Evolution</app> to check automatically for new messages, click the <gui>Check for
new messages every … minutes</gui> option and select the frequency in minutes.</p></item>
<item><p>Select if you want to show folders in short notation.</p>
<p>For example, comp.os.linux would appear as c.o.linux.</p></item>
<item><p>Select if you want to show relative folder names in the <link
xref="mail-imap-subscriptions">subscriptions window</link>.</p>
diff --git a/help/C/mail-recognized-thread-related-headers.page
b/help/C/mail-recognized-thread-related-headers.page
index 0558b9c..1008835 100644
--- a/help/C/mail-recognized-thread-related-headers.page
+++ b/help/C/mail-recognized-thread-related-headers.page
@@ -2,7 +2,7 @@
type="topic" id="mail-recognized-thread-related-headers">
<info>
- <desc>Which thread-related headers are recognized by Evolution.</desc>
+ <desc>Which thread-related headers are recognized by <app>Evolution</app>.</desc>
<link type="guide" xref="index#common-mail-problems" />
@@ -17,9 +17,9 @@
</info>
-<title>Thread related headers recognized by Evolution</title>
+<title>Thread related headers recognized by <app>Evolution</app></title>
-<p>Evolution supports the following headers:</p>
+<p><app>Evolution</app> supports the following headers:</p>
<list>
<item><p>References</p></item>
<item><p>In-Reply-To</p></item>
diff --git a/help/C/mail-refresh-folders.page b/help/C/mail-refresh-folders.page
index 52292ee..36c9d3e 100644
--- a/help/C/mail-refresh-folders.page
+++ b/help/C/mail-refresh-folders.page
@@ -2,7 +2,7 @@
type="topic" id="mail-refresh-folders">
<info>
- <desc>Ways to update your Evolution folders.</desc>
+ <desc>Ways to update your <app>Evolution</app> folders.</desc>
<link type="guide" xref="index#common-mail-problems" />
diff --git a/help/C/mail-search-folders-conditions.page b/help/C/mail-search-folders-conditions.page
index b5ff8ff..9e4f0e3 100644
--- a/help/C/mail-search-folders-conditions.page
+++ b/help/C/mail-search-folders-conditions.page
@@ -20,7 +20,7 @@
</info>
- <title>Available Search folder conditions</title>
+ <title>Available <gui>Search</gui> folder conditions</title>
<list>
@@ -31,7 +31,7 @@ included by XInclude. See http://blogs.gnome.org/shaunm/2011/07/21/understanding
xmlns="http://www.w3.org/2001/XInclude"/>
<item><p>Message Location:</p>
-<p>Checks whether the message is located in a specific folder.</p><p>Note that by default, Evolution's
<gui>Trash</gui> and <gui>Junk</gui> folders are <link xref="mail-search-folders">Search folders</link> so
they cannot be selected here.</p></item>
+<p>Checks whether the message is located in a specific folder.</p><p>Note that by default,
<app>Evolution</app>'s <gui>Trash</gui> and <gui>Junk</gui> folders are <link
xref="mail-search-folders"><gui>Search</gui> folders</link> so they cannot be selected here.</p></item>
<item><p>Match All:</p>
<p>Applies an action always to any message, without further conditions. This could be useful at the end of
the list of search folders to cover those emails that did not match any conditions for the preceding search
folders in the list.</p></item>
diff --git a/help/C/mail-search-folders-refresh.page b/help/C/mail-search-folders-refresh.page
index 11b2655..34dfa8b 100644
--- a/help/C/mail-search-folders-refresh.page
+++ b/help/C/mail-search-folders-refresh.page
@@ -2,7 +2,7 @@
type="topic" id="mail-search-folders-refresh">
<info>
- <desc>Ways of updating Search folders.</desc>
+ <desc>Ways of updating <gui>Search</gui> folders.</desc>
<link type="guide" xref="mail-search-folders" />
@@ -21,9 +21,9 @@
</info>
-<title>Updating/refreshing Search folders</title>
+<title>Updating/refreshing <gui>Search</gui> folders</title>
-<p>It might happen that one of your Search folders has not updated since some new email arrived or since an
email was deleted, for example. This will mean that the list of emails in the folder is not up-to-date.</p>
+<p>It might happen that one of your <gui>Search</gui> folders has not updated since some new email arrived
or since an email was deleted, for example. This will mean that the list of emails in the folder is not
up-to-date.</p>
<p>You can get an updated view of the search folder either by switching to another folder and then back
again, or by right-clicking on the search folder and choosing <gui>Refresh</gui>.</p>
diff --git a/help/C/mail-search-folders.page b/help/C/mail-search-folders.page
index 88fa7fe..ae38473 100644
--- a/help/C/mail-search-folders.page
+++ b/help/C/mail-search-folders.page
@@ -19,13 +19,13 @@
</info>
- <title>Using Search folders</title>
+ <title>Using <gui>Search</gui> folders</title>
<p>If <link xref="mail-filters">filters</link> are not flexible enough, or you find yourself performing the
same <link xref="mail-searching">search</link> again and again, consider a search folder.</p>
<p>A search folder looks like a <link xref="mail-folders">folder</link>, it acts like a <link
xref="mail-searching">search</link>, and you set it up like a <link xref="mail-filters">filter</link>. While
a conventional folder actually contains messages, a search folder is a view of messages that might be in
several different folders. The messages it contains are determined on the fly using a set of criteria that
you have chosen when setting up the search folder.</p>
-<p>Evolution automatically updates the search folder contents when new messages are received or message are
deleted.</p>
+<p><app>Evolution</app> automatically updates the search folder contents when new messages are received or
message are deleted.</p>
<p>The <gui>Unmatched</gui> search folder is the opposite of other search folders: it displays all messages
that do not appear in other search folders.</p>
diff --git a/help/C/mail-searching.page b/help/C/mail-searching.page
index fbd74fe..52a13e3 100644
--- a/help/C/mail-searching.page
+++ b/help/C/mail-searching.page
@@ -47,7 +47,7 @@
<note style="tip"><p>For the <gui>Current Account</gui> scope, the term "account" refers to top-level nodes
in the <link xref="intro-main-window#e-mail"> mail folder list</link>, like "On this computer" and remote
mail accounts.</p></note>
</item>
<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>
-<item><p>Evolution displays the search results.</p></item>
+<item><p><app>Evolution</app> displays the search results.</p></item>
</steps>
<note style="tip"><p>If you start directly from the fourth step, text will be searched in mail's subjects
and addresses and scope will be "Current folder".</p></note>
<note style="tip"><p>If you search for messages that are not in the same folder rather often you might want
to create a search folder instead; see <link xref="mail-search-folders">Using Search Folders</link> for more
detail.</p></note>
diff --git a/help/C/mail-send-and-receive-automatically.page b/help/C/mail-send-and-receive-automatically.page
index 8f292f9..3312a95 100644
--- a/help/C/mail-send-and-receive-automatically.page
+++ b/help/C/mail-send-and-receive-automatically.page
@@ -18,9 +18,9 @@
</info>
<title>Automatically check for new mail</title>
-<p>If you want Evolution to check automatically for new messages, enable the option <gui>Check for new
messages every … minutes</gui> in the <gui>Receiving Options</gui> page of the mail account settings
(accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>) and select the frequency in minutes.</p>
+<p>If you want <app>Evolution</app> to check automatically for new messages, enable the option <gui>Check
for new messages every … minutes</gui> in the <gui>Receiving Options</gui> page of the mail account settings
(accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>) and select the frequency in minutes.</p>
-<note style="advanced"><p>Evolution supports <link href="https://en.wikipedia.org/wiki/IMAP_IDLE";>IMAP
IDLE</link> on the currently selected folder and partially supports the <link
href="http://tools.ietf.org/search/rfc5465";>IMAP NOTIFY</link> extension.</p></note>
+<note style="advanced"><p><app>Evolution</app> supports <link
href="https://en.wikipedia.org/wiki/IMAP_IDLE";>IMAP IDLE</link> on the currently selected folder and
partially supports the <link href="http://tools.ietf.org/search/rfc5465";>IMAP NOTIFY</link>
extension.</p></note>
</page>
diff --git a/help/C/mail-sending-options-smtp.page b/help/C/mail-sending-options-smtp.page
index d069e49..87d4880 100644
--- a/help/C/mail-sending-options-smtp.page
+++ b/help/C/mail-sending-options-smtp.page
@@ -31,7 +31,7 @@
</item>
<item><p>If the server requires authentication, you need to provide the following information:</p>
<list>
- <item><p>Select the authentication type in the Authentication list, or click <gui>Check for Supported
Types</gui> to have Evolution check. Some servers do not support this, so clicking this button is not a
guarantee that available mechanisms actually work.</p></item>
+ <item><p>Select the authentication type in the Authentication list, or click <gui>Check for Supported
Types</gui> to have <app>Evolution</app> check. Some servers do not support this, so clicking this button is
not a guarantee that available mechanisms actually work.</p></item>
<item><p>Enter your username.</p></item>
</list>
</item>
diff --git a/help/C/mail-several-pop-accounts.page b/help/C/mail-several-pop-accounts.page
index 24426f2..d0c760b 100644
--- a/help/C/mail-several-pop-accounts.page
+++ b/help/C/mail-several-pop-accounts.page
@@ -21,7 +21,7 @@
<title>Separating POP mail for more than one account</title>
-<p>It is not possible to have separate accounts in the accounts and folder list pane. Evolution only has one
unique inbox for incoming email.</p>
+<p>It is not possible to have separate accounts in the accounts and folder list pane. <app>Evolution</app>
only has one unique inbox for incoming email.</p>
<p>You can either use IMAP instead of POP, or move incoming emails into different folders by <link
xref="mail-folders">creating folders</link> and <link xref="mail-filters">creating filters</link>: Create a
new folder and create two subfolders (for incoming and for sent mail of that account). Now set up an incoming
filter via <guiseq><gui>Edit</gui><gui>Message Filters…</gui><gui style="button">Add</gui></guiseq> to move
incoming mail to the incoming folder by filtering on the recipient's address and set up an outgoing filter to
move outgoing mail to the sent folder by filtering on the sender's address.</p>
<!-- https://bugzilla.gnome.org/show_bug.cgi?id=273944 -->
diff --git a/help/C/mail-sorting-message-list.page b/help/C/mail-sorting-message-list.page
index 0bef4c7..4e0557d 100644
--- a/help/C/mail-sorting-message-list.page
+++ b/help/C/mail-sorting-message-list.page
@@ -27,7 +27,7 @@
<title>Sorting the message list</title>
-<p>Evolution lets you organize your emails by letting you sort messages in the <link
xref="intro-main-window#e-mail">message list</link>.</p>
+<p><app>Evolution</app> lets you organize your emails by letting you sort messages in the <link
xref="intro-main-window#e-mail">message list</link>.</p>
<section id="email-threads">
<title>Sorting Mail in Email Threads</title>
@@ -51,12 +51,12 @@
<item><p>Select the <gui>Remove This Column</gui> or <gui>Add a Column</gui> option.</p></item>
</list>
-<p>Evolution allows you to sort your messages using these columns. Just click on the column label to sort
the emails. The direction of the arrow next to the label indicates the direction of the sort.</p>
+<p><app>Evolution</app> allows you to sort your messages using these columns. Just click on the column label
to sort the emails. The direction of the arrow next to the label indicates the direction of the sort.</p>
</section>
<section id="sort-options">
<title>Using Other Sorting Options</title>
-<p>Evolution provides other ways for sorting email messages. You can use Sort By, Sort Ascending, Sort
Descending, or Unsort.</p>
+<p><app>Evolution</app> provides other ways for sorting email messages. You can use Sort By, Sort Ascending,
Sort Descending, or Unsort.</p>
<section id="sort-options-by">
<title>Sort By</title>
<p>You can also sort email messages using the <gui>Sort By</gui> list.</p>
diff --git a/help/C/mail-spam-marking.page b/help/C/mail-spam-marking.page
index 3c96d12..24ac88b 100644
--- a/help/C/mail-spam-marking.page
+++ b/help/C/mail-spam-marking.page
@@ -33,7 +33,7 @@
<section id="marking-junk">
<title>Manually Marking Junk Mail</title>
-<p>If Evolution misses junk mail, right-click the message, then click <gui>Mark as Junk</gui>, or mark the
message and press <keyseq><key>Ctrl</key><key>J</key></keyseq> or click the <gui>Junk</gui> button in the
tool bar. When you correct it, the filter can recognize similar messages in the future, and becomes more
accurate as time goes on.</p>
+<p>If <app>Evolution</app> misses junk mail, right-click the message, then click <gui>Mark as Junk</gui>, or
mark the message and press <keyseq><key>Ctrl</key><key>J</key></keyseq> or click the <gui>Junk</gui> button
in the tool bar. When you correct it, the filter can recognize similar messages in the future, and becomes
more accurate as time goes on.</p>
<p>If legitimate mail is incorrectly flagged, remove it from the <gui>Junk</gui> folder by right-clicking it
and selecting <gui>Mark as Not Junk</gui> or pressing
<keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>, or mark the message and click the <gui>Not
Junk</gui> button.</p>
</section>
diff --git a/help/C/mail-spam-settings.page b/help/C/mail-spam-settings.page
index b99b026..6b7d033 100644
--- a/help/C/mail-spam-settings.page
+++ b/help/C/mail-spam-settings.page
@@ -59,8 +59,8 @@
<section id="preferences">
<title>Junk Mail Preferences</title>
-<note style="tip"><p>The junk mail options discussed in this page refer only to POP and Local Delivery
accounts. For handling junk mail on IMAP accounts, see the Evolution settings under
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>.</p></note>
-<p>You can modify how Evolution handles junk mail by changing the Junk Mail Preferences:</p>
+<note style="tip"><p>The junk mail options discussed in this page refer only to POP and Local Delivery
accounts. For handling junk mail on IMAP accounts, see the <app>Evolution</app> settings under
<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Receiving Options</gui></guiseq>.</p></note>
+<p>You can modify how <app>Evolution</app> handles junk mail by changing the Junk Mail Preferences:</p>
<steps>
<item><p>Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> or press
<keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>.</p></item>
<item><p>Select <gui>Mail Preferences</gui>.</p></item>
diff --git a/help/C/mail-two-trash-folders.page b/help/C/mail-two-trash-folders.page
index 32e4eed..16a34ed 100644
--- a/help/C/mail-two-trash-folders.page
+++ b/help/C/mail-two-trash-folders.page
@@ -22,13 +22,13 @@
</info>
-<title>Two Trash or Junk folders shown for the same account</title>
+<title>Two Trash or <gui>Junk</gui> folders shown for the same account</title>
-<p>If you use a remote mail account that also has Junk and/or Trash folders on the server you might face
duplicated folders in Evolution.</p>
-<p>You can easily tell the two Trash folders apart by looking at their icons. The Evolution <gui>Trash</gui>
folder has a special icon whereas the other physical Trash folder looks like any other folder.</p>
+<p>If you use a remote mail account that also has Junk and/or <gui>Trash</gui> folders on the server you
might face duplicated folders in <app>Evolution</app>.</p>
+<p>You can easily tell the two <gui>Trash</gui> folders apart by looking at their icons. The
<app>Evolution</app> <gui>Trash</gui> folder has a special icon whereas the other physical <gui>Trash</gui>
folder looks like any other folder.</p>
-<p>By default, Evolution's <gui>Trash</gui> and <gui>Junk</gui> folders are <link
xref="mail-search-folders">Search folders</link>. They do not really exist but simply display all the
messages that are marked as junk or for deletion in any folders of that account.</p>
+<p>By default, <app>Evolution</app>'s <gui>Trash</gui> and <gui>Junk</gui> folders are <link
xref="mail-search-folders">Search folders</link>. They do not really exist but simply display all the
messages that are marked as junk or for deletion in any folders of that account.</p>
-<p>In order to only use the folders for Junk and Trash on the mail server, select the corresponding <gui>Use
a Real Folder</gui> option under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Defaults</gui></guiseq>. In this case, Evolution's local virtual folders will
not be used.</p>
+<p>In order to only use the folders for Junk and Trash on the mail server, select the corresponding <gui>Use
a Real Folder</gui> option under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui
style="button">Edit</gui><gui>Defaults</gui></guiseq>. In this case, <app>Evolution</app>'s local virtual
folders will not be used.</p>
</page>
diff --git a/help/C/mail-vertical-view.page b/help/C/mail-vertical-view.page
index de7d8ee..5a88cdf 100644
--- a/help/C/mail-vertical-view.page
+++ b/help/C/mail-vertical-view.page
@@ -21,7 +21,7 @@
<title>Vertical view</title>
-<p>Evolution provides a vertical view in addition to the classical view. In the vertical view, the message
preview pane is located at the right side of the message list when compared to the classical view where the
message preview pane is placed below the message list. Vertical view enables you to use the extra width of
wide screen monitors.</p>
+<p><app>Evolution</app> provides a vertical view in addition to the classical view. In the vertical view,
the message preview pane is located at the right side of the message list when compared to the classical view
where the message preview pane is placed below the message list. Vertical view enables you to use the extra
width of wide screen monitors.</p>
<p>To switch to vertical view, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Vertical
View</gui></guiseq>.</p>
diff --git a/help/C/mail-working-offline.page b/help/C/mail-working-offline.page
index e8e8bde..f4254a4 100644
--- a/help/C/mail-working-offline.page
+++ b/help/C/mail-working-offline.page
@@ -22,11 +22,11 @@
<title>Working Offline</title>
-<p>Forced offline mode helps you communicate with remote mail storage systems like GroupWise, IMAP or
Exchange, in situations where you are not connected to the network at all times. Evolution keeps a local copy
of one or more folders to allow you to compose messages, storing them in your Outbox to be sent the next time
you connect.</p>
+<p>Forced offline mode helps you communicate with remote mail storage systems like GroupWise, IMAP or
Exchange, in situations where you are not connected to the network at all times. <app>Evolution</app> keeps a
local copy of one or more folders to allow you to compose messages, storing them in your Outbox to be sent
the next time you connect.</p>
-<note style="warning"><p>Evolution's forced offline mode only refers to mail and does not apply to contacts
and calendars.</p></note>
+<note style="warning"><p><app>Evolution</app>'s forced offline mode only refers to mail and does not apply
to contacts and calendars.</p></note>
-<p>POP mail downloads all messages to your local system, but other connections usually download just the
headers, and get the rest only when you want to read the message. Before you force Evolution to be offline,
Evolution downloads the unread messages from the folders you have chosen to store.</p>
+<p>POP mail downloads all messages to your local system, but other connections usually download just the
headers, and get the rest only when you want to read the message. Before you force <app>Evolution</app> to be
offline, <app>Evolution</app> downloads the unread messages from the folders you have chosen to store.</p>
<section id="mark-folders">
<title>Marking folders for offline usage</title>
@@ -39,13 +39,13 @@
<section id="sync-for-offline">
<title>Syncing messages for offline usage</title>
-<p>Your connection status is shown by the small icon in the lower left corner of the Evolution main window.
When you are online, it displays two connected cables. When you force offline mode via clicking the icon or
via <guiseq><gui>File</gui><gui>Work Offline</gui></guiseq>, the cables separate. You will be asked whether
you want to go offline immediately or synchronize folders locally before you go offline.</p>
+<p>Your connection status is shown by the small icon in the lower left corner of the <app>Evolution</app>
main window. When you are online, it displays two connected cables. When you force offline mode via clicking
the icon or via <guiseq><gui>File</gui><gui>Work Offline</gui></guiseq>, the cables separate. You will be
asked whether you want to go offline immediately or synchronize folders locally before you go offline.</p>
<p>To download Messages for Offline Operations without immediately going offline, select
<guiseq><gui>File</gui><gui>Download Messages for Offline Usage</gui></guiseq>.</p>
</section>
<section id="network-manager-integration">
<title>Automatic Network State Handling</title>
-<p>Evolution automatically understands the network state and acts accordingly. For instance, Evolution
switches to offline mode when the network goes down and automatically switches on when the network is up
again.</p>
+<p><app>Evolution</app> automatically understands the network state and acts accordingly. For instance,
<app>Evolution</app> switches to offline mode when the network goes down and automatically switches on when
the network is up again.</p>
</section>
</page>
diff --git a/help/C/memos-searching.page b/help/C/memos-searching.page
index 2dc765c..80185af 100644
--- a/help/C/memos-searching.page
+++ b/help/C/memos-searching.page
@@ -43,13 +43,13 @@
<item><p>Click the search icon <media type="image" mime="image/png" its:translate="no"
src="figures/search-icon.png"/> to expand the drop-down list.</p></item>
<item><p>Select the search condition from the list.</p></item>
<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>
-<item><p>Evolution displays the search results.</p></item>
+<item><p><app>Evolution</app> displays the search results.</p></item>
</steps>
<p>Searching by category:</p>
<steps>
<item><p>Click the <gui>Show</gui> drop-down list.</p></item>
<item><p>Select the category from the list.</p></item>
-<item><p>Evolution displays the search results.</p></item>
+<item><p><app>Evolution</app> displays the search results.</p></item>
</steps>
<p>If you want to set several search conditions, you should use an Advanced search, which is described
below.</p>
</section>
diff --git a/help/C/offline.page b/help/C/offline.page
index e36a652..23d15b1 100644
--- a/help/C/offline.page
+++ b/help/C/offline.page
@@ -2,7 +2,7 @@
type="topic" id="offline">
<info>
- <desc>Make Evolution mail be online again.</desc>
+ <desc>Make <app>Evolution</app> mail be online again.</desc>
<link type="guide" xref="index#common-other-problems"/>
<link type="seealso" xref="mail-working-offline" />
@@ -24,19 +24,19 @@
</info>
-<title>Why is Evolution's mail component offline?</title>
-<p>You may have started Evolution with the <cmd>--offline</cmd> commandline option to enforce offline
mode.</p>
+<title>Why is <app>Evolution</app>'s mail component offline?</title>
+<p>You may have started <app>Evolution</app> with the <cmd>--offline</cmd> commandline option to enforce
offline mode.</p>
-<p>If this is not the case and Evolution normally works but has suddenly stopped connecting to your mail
accounts, you may have unintentionally clicked on the connection icon in the lower left corner. When
connected, the icon resembles a pair of sockets joined together. If the sockets are open, there is no
connection to your mail accounts (and the <gui style="button">Send/Receive</gui> button is grayed out). Click
on the icon to change its state.</p>
+<p>If this is not the case and <app>Evolution</app> normally works but has suddenly stopped connecting to
your mail accounts, you may have unintentionally clicked on the connection icon in the lower left corner.
When connected, the icon resembles a pair of sockets joined together. If the sockets are open, there is no
connection to your mail accounts (and the <gui style="button">Send/Receive</gui> button is grayed out). Click
on the icon to change its state.</p>
<p>If the problem persists and you are sure you have not clicked the icon, but you can still reach the
network from other apps on your system (browsers, FTP, SSH, ping etc.) it may be that your network connection
is not properly configured. For more information please take a look at the <link
xref="help:gnome-help/net-problem" href="https://help.gnome.org/users/gnome-help/stable/net-problem";>Desktop
help</link> or seek help from your distribution support forums, mailing lists etc.</p>
<!-- from https://bugzilla.gnome.org/show_bug.cgi?id=728604 -->
-<p>If you want to force Evolution to be in online mode, make sure that Evolution is not running and open a
<app>Terminal</app> window and type the following command:</p>
+<p>If you want to force <app>Evolution</app> to be in online mode, make sure that <app>Evolution</app> is
not running and open a <app>Terminal</app> window and type the following command:</p>
<p><cmd its:translate="no">
GIO_USE_NETWORK_MONITOR=base evolution
</cmd></p>
-<note style="warning"><p>Evolution's forced offline mode only refers to mail and does not apply to contacts
and calendars.</p></note>
+<note style="warning"><p><app>Evolution</app>'s forced offline mode only refers to mail and does not apply
to contacts and calendars.</p></note>
</page>
diff --git a/help/C/organizing.page b/help/C/organizing.page
index 2ae0418..b3f4619 100644
--- a/help/C/organizing.page
+++ b/help/C/organizing.page
@@ -2,7 +2,7 @@
type="guide" id="organizing">
<info>
- <desc>On organizing and finding your data in Evolution.</desc>
+ <desc>On organizing and finding your data in <app>Evolution</app>.</desc>
<revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="stub"/>
<credit type="author">
diff --git a/help/C/problems-debug-how-to.page b/help/C/problems-debug-how-to.page
index 587edf4..b8d6c6a 100644
--- a/help/C/problems-debug-how-to.page
+++ b/help/C/problems-debug-how-to.page
@@ -22,9 +22,9 @@
<p>As a first hint, error messages will be either displayed in the statusbar or between the tool bar and the
search bar.</p>
-<p>To further track down a problem, some debug options are listed on the <link
href="https://wiki.gnome.org/Apps/Evolution/Debugging";>Evolution project website</link>.</p>
+<p>To further track down a problem, some debug options are listed on the <link
href="https://wiki.gnome.org/Apps/Evolution/Debugging";><app>Evolution</app> project website</link>.</p>
-<p>To contact the Evolution community for help, please see <link xref="problems-getting-help">How to get
help</link>.</p>
+<p>To contact the <app>Evolution</app> community for help, please see <link xref="problems-getting-help">How
to get help</link>.</p>
<!-- Debug logs as described in http://library.gnome.org/users/evolution/2.32/b1a4ol61.html.en do not exist
anymore in 3.0 -->
</page>
diff --git a/help/C/problems-getting-help.page b/help/C/problems-getting-help.page
index d935b5e..808b4e9 100644
--- a/help/C/problems-getting-help.page
+++ b/help/C/problems-getting-help.page
@@ -21,5 +21,5 @@
<title>How to get help</title>
-<p>To receive help on problems you can send an email to the <link
href="http://mail.gnome.org/mailman/listinfo/evolution-list";>Evolution mailing list</link> or talk to
developers and other users in the IRC chat channel #evolution on the server irc.gimp.net. To connect to an
IRC server you can for example <link xref="help:empathy/irc-manage"
href="https://help.gnome.org/users/empathy/stable/irc-manage";>use the internet messenger application
<app>Empathy</app></link>.</p>
+<p>To receive help on problems you can send an email to the <link
href="http://mail.gnome.org/mailman/listinfo/evolution-list";><app>Evolution</app> mailing list</link> or talk
to developers and other users in the IRC chat channel #evolution on the server irc.gimp.net. To connect to an
IRC server you can for example <link xref="help:empathy/irc-manage"
href="https://help.gnome.org/users/empathy/stable/irc-manage";>use the internet messenger application
<app>Empathy</app></link>.</p>
</page>
diff --git a/help/C/problems-reporting-bugs.page b/help/C/problems-reporting-bugs.page
index dddf518..ad9330e 100644
--- a/help/C/problems-reporting-bugs.page
+++ b/help/C/problems-reporting-bugs.page
@@ -20,8 +20,8 @@
<title>How to report bugs</title>
-<p>If you do not need help for configuration but you are sure that you have found a mistake or wrong
behavior in the Evolution software, or if you want to request a feature, you can file a report in the <link
href="http://bugzilla.gnome.org";>GNOME bug tracking system</link>. Note that this requires registration
first. Please try to avoid filing duplicates and check the <link
href="https://bugzilla.gnome.org/page.cgi?id=bug-writing.html";>bug writing guidelines</link>
first.</p><p>Also note that GNOME distributions sometimes introduce their own changes in Evolution that are
not included in GNOME Evolution. This is hard to recognize for users but if you are aware of it please file a
bug report in <link
href="https://wiki.gnome.org/Bugsquad/TriageGuide/NonGnome#Bug_trackers_for_distributions";>the bug tracker of
your GNOME distribution</link> instead.</p>
+<p>If you do not need help for configuration but you are sure that you have found a mistake or wrong
behavior in the <app>Evolution</app> software, or if you want to request a feature, you can file a report in
the <link href="http://bugzilla.gnome.org";>GNOME bug tracking system</link>. Note that this requires
registration first. Please try to avoid filing duplicates and check the <link
href="https://bugzilla.gnome.org/page.cgi?id=bug-writing.html";>bug writing guidelines</link>
first.</p><p>Also note that GNOME distributions sometimes introduce their own changes in <app>Evolution</app>
that are not included in GNOME <app>Evolution</app>. This is hard to recognize for users but if you are aware
of it please file a bug report in <link
href="https://wiki.gnome.org/Bugsquad/TriageGuide/NonGnome#Bug_trackers_for_distributions";>the bug tracker of
your GNOME distribution</link> instead.</p>
-<p>When reporting bugs exact information is welcome as it makes it easier for others to reproduce and fix
the issue. If possible please include information such as the Evolution version (under
<guiseq><gui>Help</gui><gui>About</gui></guiseq>), your distribution, and exact steps to reproduce the
problem, click by click. See the <link href="https://bugzilla.gnome.org/page.cgi?id=bug-writing.html";>Bug
Writing Guidelines</link> for more information.</p>
+<p>When reporting bugs exact information is welcome as it makes it easier for others to reproduce and fix
the issue. If possible please include information such as the <app>Evolution</app> version (under
<guiseq><gui>Help</gui><gui>About</gui></guiseq>), your distribution, and exact steps to reproduce the
problem, click by click. See the <link href="https://bugzilla.gnome.org/page.cgi?id=bug-writing.html";>Bug
Writing Guidelines</link> for more information.</p>
</page>
diff --git a/help/C/sync-with-other-devices.page b/help/C/sync-with-other-devices.page
index 495c921..a4cffae 100644
--- a/help/C/sync-with-other-devices.page
+++ b/help/C/sync-with-other-devices.page
@@ -2,7 +2,7 @@
type="topic" id="sync-with-other-devices">
<info>
- <desc>Synchronize Evolution data with handheld devices and mobile phones.</desc>
+ <desc>Synchronize <app>Evolution</app> data with handheld devices and mobile phones.</desc>
<link type="guide" xref="index#data-migration-and-sync"/>
@@ -14,7 +14,7 @@
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-<!-- TODO:POST-3-8: Find out how to sync modern devices, e.g. Android, iPhone, Nokia N97 / N900, N9, N950,
etc. Maybe SyncEvolution is the recommended (and external) way here? -->
+<!-- TODO:POST-3-8: Find out how to sync modern devices, e.g. Android, iPhone, Nokia N97 / N900, N9, N950,
etc. Maybe Syn <app>Evolution</app> is the recommended (and external) way here? -->
</info>
<title>Synchronize <app>Evolution</app> with other devices</title>
diff --git a/help/C/tasks-caldav.page b/help/C/tasks-caldav.page
index c68db8a..6b45515 100644
--- a/help/C/tasks-caldav.page
+++ b/help/C/tasks-caldav.page
@@ -19,7 +19,7 @@
<title>Using a CalDAV task or memo list</title>
-<p>To add such a task list or memo list to Evolution, perform the following steps:</p>
+<p>To add such a task list or memo list to <app>Evolution</app>, perform the following steps:</p>
<steps>
<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or
<guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>.</p></item>
<item><p>Select the type <gui>On the Web</gui>.</p></item>
@@ -32,6 +32,6 @@
<item><p>Click <gui style="button">Apply</gui>.</p></item>
</steps>
-<p>The task list will be added to the list of task lists in Evolution.</p>
+<p>The task list will be added to the list of task lists in <app>Evolution</app>.</p>
</page>
diff --git a/help/C/tasks-local.page b/help/C/tasks-local.page
index cc73e2a..93f1946 100644
--- a/help/C/tasks-local.page
+++ b/help/C/tasks-local.page
@@ -19,7 +19,7 @@
<title>Adding another local task or memo list</title>
-<p>To add another local task list to Evolution, perform the following steps:</p>
+<p>To add another local task list to <app>Evolution</app>, perform the following steps:</p>
<steps>
<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or
<guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>.</p></item>
<item><p>Select the type <gui>On This Computer</gui>.</p></item>
@@ -28,6 +28,6 @@
<item><p>Click <gui style="button">Apply</gui>.</p></item>
</steps>
-<p>The task list will be added to the list of task lists in Evolution.</p>
+<p>The task list will be added to the list of task lists in <app>Evolution</app>.</p>
</page>
diff --git a/help/C/tasks-searching.page b/help/C/tasks-searching.page
index 05e41ec..83bba48 100644
--- a/help/C/tasks-searching.page
+++ b/help/C/tasks-searching.page
@@ -43,13 +43,13 @@
<item><p>Click the search icon <media type="image" mime="image/png" its:translate="no"
src="figures/search-icon.png"/> to expand the drop-down list.</p></item>
<item><p>Select the search condition from the list.</p></item>
<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>
-<item><p>Evolution displays the search results.</p></item>
+<item><p><app>Evolution</app> displays the search results.</p></item>
</steps>
<p>Searching by category:</p>
<steps>
<item><p>Click the <gui>Show</gui> drop-down list.</p></item>
<item><p>Select the category from the list.</p></item>
-<item><p>Evolution displays the search results.</p></item>
+<item><p><app>Evolution</app> displays the search results.</p></item>
</steps>
<p>If you want to set several search conditions, you should use an Advanced search, which is described
below.</p>
</section>
diff --git a/help/C/tasks-usage-add-task.page b/help/C/tasks-usage-add-task.page
index b6ddf42..a104e0e 100644
--- a/help/C/tasks-usage-add-task.page
+++ b/help/C/tasks-usage-add-task.page
@@ -36,7 +36,7 @@
<section id="assigned-tasks">
<title>Assigned Tasks</title>
-<p>Evolution can be used to assign a task to multiple people.</p>
+<p><app>Evolution</app> can be used to assign a task to multiple people.</p>
<p>When you assign a task, you can specify the attendees in several categories, such as "chair" or
"required". When you save the task, each attendee is sent an email with the task information, which also
gives them the option to respond.</p>
<p>This is similar to <link xref="calendar-meetings-sending-invitation">meetings</link>.</p>
<p>To create an assigned task, click <guiseq><gui>File</gui><gui>New</gui><gui>Assigned
Task</gui></guiseq>.</p>
diff --git a/help/C/tasks-webdav.page b/help/C/tasks-webdav.page
index 208ce5a..09bbbdc 100644
--- a/help/C/tasks-webdav.page
+++ b/help/C/tasks-webdav.page
@@ -21,7 +21,7 @@
<p>Lists of this type are read-only.</p>
-<p>To add such a task list or memo list to Evolution, perform the following steps:</p>
+<p>To add such a task list or memo list to <app>Evolution</app>, perform the following steps:</p>
<steps>
<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or
<guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>.</p></item>
<item><p>Select the type <gui>On the Web</gui>.</p></item>
@@ -34,6 +34,6 @@
<item><p>Click <gui style="button">Apply</gui>.</p></item>
</steps>
-<p>The list will be added in Evolution.</p>
+<p>The list will be added in <app>Evolution</app>.</p>
</page>
diff --git a/help/C/xinclude-filter-vfolder-conditions.xml b/help/C/xinclude-filter-vfolder-conditions.xml
index a879d0d..3e83900 100644
--- a/help/C/xinclude-filter-vfolder-conditions.xml
+++ b/help/C/xinclude-filter-vfolder-conditions.xml
@@ -20,13 +20,13 @@
<item><p>Specific Header:</p>
<p>Any header including <link xref="mail-composer-custom-header-lines">custom ones</link>.</p>
-<p>If a message uses a header more than once, Evolution pays attention only to the first instance, even if
the message defines the header differently the second time. For example, if a message declares the
Resent-From: header as "engineering example com" and then restates it as "marketing example com", Evolution
filters as though the second declaration did not occur. To filter on messages that use headers multiple
times, use a regular expression.</p></item>
+<p>If a message uses a header more than once, <app>Evolution</app> pays attention only to the first
instance, even if the message defines the header differently the second time. For example, if a message
declares the Resent-From: header as "engineering example com" and then restates it as "marketing example
com", <app>Evolution</app> filters as though the second declaration did not occur. To filter on messages that
use headers multiple times, use a regular expression.</p></item>
<item><p>Message Body:</p>
<p>Searches in the actual text of the message.</p></item>
<item><p>Expression:</p>
-<p>(For programmers only) Match a message according to an expression you write in the Scheme language used
to define <link xref="mail-filters">filters</link> in Evolution.</p></item>
+<p>(For programmers only) Match a message according to an expression you write in the Scheme language used
to define <link xref="mail-filters">filters</link> in <app>Evolution</app>.</p></item>
<item><p>Free Form Expression:</p>
<p>(For advanced users only) Combine numerous conditions by using a <link
href="https://bugzilla.gnome.org/show_bug.cgi?id=550796#c10";>special syntax</link>.</p></item>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
